diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:46:10 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 22:46:59 +0000 |
| commit | 9c4df4389f9d998ce8b59b1665a018b69a2eb865 (patch) | |
| tree | 938ee942cded36361be8f4a3e257dd9649472784 /WebCore/platform | |
| parent | 77dd3843724f8ca0ae8084012c79af6ffbaef528 (diff) | |
| download | external_webkit-9c4df4389f9d998ce8b59b1665a018b69a2eb865.zip external_webkit-9c4df4389f9d998ce8b59b1665a018b69a2eb865.tar.gz external_webkit-9c4df4389f9d998ce8b59b1665a018b69a2eb865.tar.bz2 | |
Merge webkit.org at r54127 : GIFImageDecoder now requires ImageDecoder.
ImageDecoder requires numerous additional include paths.
Change-Id: I047d36db7b5f28e7602f55eeeedc04beb713c079
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/image-decoders/ImageDecoder.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp index ba65e92..c486a6a 100644 --- a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp @@ -45,7 +45,7 @@ #ifdef ANDROID_ANIMATED_GIF #include "EmojiFont.h" - #include "gif/GIFImageDecoder.h" + #include "GIFImageDecoder.h" using namespace android; #endif diff --git a/WebCore/platform/image-decoders/ImageDecoder.cpp b/WebCore/platform/image-decoders/ImageDecoder.cpp index 62f6bec..ed13048 100644 --- a/WebCore/platform/image-decoders/ImageDecoder.cpp +++ b/WebCore/platform/image-decoders/ImageDecoder.cpp @@ -52,6 +52,10 @@ static unsigned copyFromSharedBuffer(char* buffer, unsigned bufferLength, const return bytesExtracted; } +#if !OS(ANDROID) +// This method requires BMPImageDecoder, PNGImageDecoder, ICOImageDecoder and +// JPEGDecoder, which aren't used on Android, and which don't all compile. +// TODO: Find a better fix. ImageDecoder* ImageDecoder::create(const SharedBuffer& data) { // We need at least 4 bytes to figure out what kind of image we're dealing with. @@ -93,6 +97,7 @@ ImageDecoder* ImageDecoder::create(const SharedBuffer& data) // Give up. We don't know what the heck this is. return 0; } +#endif // !OS(ANDROID) #if !PLATFORM(SKIA) |