diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp b/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp index 905480d10..82c367d29 100644 --- a/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp +++ b/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp @@ -42,6 +42,7 @@ #include "ImageData.h" #include "JPEGImageEncoder.h" #include "MIMETypeRegistry.h" +#include "MemoryInstrumentationSkia.h" #include "PNGImageEncoder.h" #include "PlatformContextSkia.h" #include "SharedGraphicsContext3D.h" @@ -373,6 +374,16 @@ String ImageBuffer::toDataURL(const String& mimeType, const double* quality, Coo return "data:" + mimeType + ";base64," + base64Data; } +void ImageBufferData::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +{ + MemoryClassInfo info(memoryObjectInfo, this); + info.addMember(m_canvas); + info.addMember(m_platformContext); +#if USE(ACCELERATED_COMPOSITING) + info.addMember(m_layerBridge); +#endif +} + String ImageDataToDataURL(const ImageData& imageData, const String& mimeType, const double* quality) { ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType)); |