diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-17 06:40:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-17 06:40:13 -0700 |
| commit | bc5fe496bf48aa18d6b41db4c43e20f890240de2 (patch) | |
| tree | 4b06d6388c3ecda15389bd4cfd27e7f93b18f161 /WebCore | |
| parent | bf4709b903dd2a6e118f0c5c6437a875910679bc (diff) | |
| parent | 941e55a7dc3545117c4f6951b7146307dc5e52f6 (diff) | |
| download | external_webkit-bc5fe496bf48aa18d6b41db4c43e20f890240de2.zip external_webkit-bc5fe496bf48aa18d6b41db4c43e20f890240de2.tar.gz external_webkit-bc5fe496bf48aa18d6b41db4c43e20f890240de2.tar.bz2 | |
Merge change 21488 into master-webkit-merge
* changes:
Fix compilation error inside ImageDecoderSkia.cpp
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp b/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp index ea7f227..6acaed5 100644 --- a/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp +++ b/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp @@ -27,6 +27,10 @@ #include "config.h" #include "ImageDecoder.h" +#if PLATFORM(SGL) +#include "SkBitmapRef.h" +#endif + namespace WebCore { RGBA32Buffer::RGBA32Buffer() @@ -81,7 +85,11 @@ bool RGBA32Buffer::setSize(int newWidth, int newHeight) NativeImagePtr RGBA32Buffer::asNewNativeImage() const { +#if PLATFORM(SGL) + return new SkBitmapRef(m_bitmap); +#else return new NativeImageSkia(m_bitmap); +#endif } bool RGBA32Buffer::hasAlpha() const |