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/BitmapImage.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/BitmapImage.h')
| -rw-r--r-- | WebCore/platform/graphics/BitmapImage.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/BitmapImage.h b/WebCore/platform/graphics/BitmapImage.h index db05d1c..a2de5d7 100644 --- a/WebCore/platform/graphics/BitmapImage.h +++ b/WebCore/platform/graphics/BitmapImage.h @@ -44,11 +44,6 @@ class NSImage; typedef struct HBITMAP__ *HBITMAP; #endif -#if PLATFORM(SGL) -class SkBitmap; -class SkBitmapRef; -#endif - namespace WebCore { struct FrameData; } @@ -146,10 +141,13 @@ public: #endif #if PLATFORM(SGL) -// virtual SkBitmapRef* getBitmap(); virtual void setURL(const String& str); #endif +#if PLATFORM(GTK) + virtual GdkPixbuf* getGdkPixbuf(); +#endif + virtual NativeImagePtr nativeImageForCurrentFrame() { return frameAtIndex(currentFrame()); } protected: |