diff options
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | WebCore/Android.mk | 1 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/image-decoders/ImageDecoder.cpp | 5 |
4 files changed, 12 insertions, 1 deletions
@@ -116,6 +116,11 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/WebCore/platform/graphics/skia \ $(LOCAL_PATH)/WebCore/platform/graphics/transforms \ $(LOCAL_PATH)/WebCore/platform/image-decoders \ + $(LOCAL_PATH)/WebCore/platform/image-decoders/bmp \ + $(LOCAL_PATH)/WebCore/platform/image-decoders/gif \ + $(LOCAL_PATH)/WebCore/platform/image-decoders/ico \ + $(LOCAL_PATH)/WebCore/platform/image-decoders/jpeg \ + $(LOCAL_PATH)/WebCore/platform/image-decoders/png \ $(LOCAL_PATH)/WebCore/platform/mock \ $(LOCAL_PATH)/WebCore/platform/network \ $(LOCAL_PATH)/WebCore/platform/network/android \ diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 3ef8ba8..de67b20 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -504,6 +504,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/graphics/transforms/TransformationMatrix.cpp \ platform/graphics/transforms/TranslateTransformOperation.cpp \ \ + platform/image-decoders/ImageDecoder.cpp \ platform/image-decoders/skia/ImageDecoderSkia.cpp \ platform/image-decoders/gif/GIFImageDecoder.cpp \ platform/image-decoders/gif/GIFImageReader.cpp \ 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) |