diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
| commit | 1edef79f87f9c52c21d69c87c19f8e2b140a9119 (patch) | |
| tree | cad337ef493b0d9710bf3ae478cb87cb534f598d /WebCore/platform/graphics/Image.h | |
| parent | b83fc086000e27bc227580bd0e35b9d7bee1179a (diff) | |
| parent | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (diff) | |
| download | external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.zip external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.gz external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.bz2 | |
Merge commit 'goog/master-webkit-merge' into webkit-merge-44544
Diffstat (limited to 'WebCore/platform/graphics/Image.h')
| -rw-r--r-- | WebCore/platform/graphics/Image.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/Image.h b/WebCore/platform/graphics/Image.h index 70f6d49..cff8b22 100644 --- a/WebCore/platform/graphics/Image.h +++ b/WebCore/platform/graphics/Image.h @@ -61,8 +61,8 @@ class NativeImageSkia; #include <QPixmap> #endif -#if PLATFORM(SGL) -class SkBitmapRef; +#if PLATFORM(GTK) +typedef struct _GdkPixbuf GdkPixbuf; #endif namespace WebCore { @@ -147,10 +147,13 @@ public: #endif #if PLATFORM(SGL) - virtual SkBitmapRef* getBitmap() { return 0; } virtual void setURL(const String& str) {} #endif +#if PLATFORM(GTK) + virtual GdkPixbuf* getGdkPixbuf() { return 0; } +#endif + protected: Image(ImageObserver* = 0); |