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/NativeImagePtr.h | |
| 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/NativeImagePtr.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/NativeImagePtr.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/NativeImagePtr.h b/Source/WebCore/platform/graphics/NativeImagePtr.h index 1fc3fa6c9..c98f8c25a 100644 --- a/Source/WebCore/platform/graphics/NativeImagePtr.h +++ b/Source/WebCore/platform/graphics/NativeImagePtr.h @@ -36,7 +36,7 @@ typedef struct CGImage* CGImageRef; #elif PLATFORM(QT) #include <qglobal.h> QT_BEGIN_NAMESPACE -class QImage; +class QPixmap; QT_END_NAMESPACE #elif USE(CAIRO) #include "NativeImageCairo.h" @@ -48,12 +48,16 @@ class NativeImageSkia; #include "SharedBitmap.h" #endif +namespace WTF { +class MemoryObjectInfo; +} + namespace WebCore { #if USE(CG) typedef CGImageRef NativeImagePtr; #elif PLATFORM(QT) -typedef QImage* NativeImagePtr; +typedef QPixmap* NativeImagePtr; #elif PLATFORM(OPENVG) class TiledImageOpenVG; typedef TiledImageOpenVG* NativeImagePtr; @@ -67,6 +71,7 @@ typedef wxBitmap* NativeImagePtr; typedef WebCore::NativeImageCairo* NativeImagePtr; #elif USE(SKIA) typedef WebCore::NativeImageSkia* NativeImagePtr; +void reportMemoryUsage(const NativeImageSkia* const&, WTF::MemoryObjectInfo*); #elif OS(WINCE) typedef RefPtr<SharedBitmap> NativeImagePtr; #elif PLATFORM(BLACKBERRY) |