-
loislo@chromium.org authored
https://bugs.webkit.org/show_bug.cgi?id=98917 Reviewed by Yury Semikhatsky. It also includes non intrusive instrumentation for skia classes. Source/WebCore: Test: inspector/profiler/memory-instrumentation-canvas.html * WebCore.gypi: * html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::reportMemoryUsage): (WebCore): * html/HTMLCanvasElement.h: (HTMLCanvasElement): * platform/graphics/ImageBuffer.cpp: (WebCore::ImageBuffer::reportMemoryUsage): (WebCore): * platform/graphics/ImageBuffer.h: (ImageBuffer): * platform/graphics/chromium/ImageBufferDataSkia.h: (ImageBufferData): * platform/graphics/skia/ImageBufferSkia.cpp: (WebCore::ImageBufferData::reportMemoryUsage): (WebCore): * platform/graphics/skia/MemoryInstrumentationSkia.cpp: Copied from Source/WebCore/platform/graphics/chromium/ImageBufferDataSkia.h. (reportMemoryUsage): * platform/graphics/skia/MemoryInstrumentationSkia.h: Copied from Source/WebCore/platform/graphics/chromium/ImageBufferDataSkia.h. * platform/graphics/skia/NativeImageSkia.cpp: LayoutTests: * inspector/profiler/memory-instrumentation-cached-images-expected.txt: * inspector/profiler/memory-instrumentation-cached-images.html: * inspector/profiler/memory-instrumentation-canvas.html: Added. * inspector/profiler/memory-instrumentation-test.js: Added. (initialize_MemoryInstrumentationTest.InspectorTest._memoryBlockSize): (initialize_MemoryInstrumentationTest.InspectorTest.validateMemoryBlockSize): (initialize_MemoryInstrumentationTest): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@131017 268f45cc-cd09-0410-ab3c-d52691b4dbfc
e3f6e9d9