diff options
| author | Steve Block <steveblock@google.com> | 2011-05-19 10:44:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-19 10:44:56 -0700 |
| commit | d02f0d2d9fb7ecc40c1901a88130f5d085ca5c71 (patch) | |
| tree | 8fb2e595ba4f3c69188ae161e4826175e3d85ce0 /Source/WebCore | |
| parent | 286ad6c2711b3e0299268d5aac6de39daa98beb4 (diff) | |
| parent | bc1021c1924cd3daeefe88111a63dab7b6a9bf03 (diff) | |
| download | external_webkit-d02f0d2d9fb7ecc40c1901a88130f5d085ca5c71.zip external_webkit-d02f0d2d9fb7ecc40c1901a88130f5d085ca5c71.tar.gz external_webkit-d02f0d2d9fb7ecc40c1901a88130f5d085ca5c71.tar.bz2 | |
Merge "ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need to check supportsAlpha()"
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/platform/graphics/ImageSource.h | 4 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/ImageSource.h b/Source/WebCore/platform/graphics/ImageSource.h index 29c1be3..1452b71 100644 --- a/Source/WebCore/platform/graphics/ImageSource.h +++ b/Source/WebCore/platform/graphics/ImageSource.h @@ -87,13 +87,13 @@ typedef ImageDecoderQt* NativeImageSourcePtr; typedef QPixmap* NativeImagePtr; #elif PLATFORM(SKIA) && PLATFORM(ANDROID) #ifdef ANDROID_ANIMATED_GIF -class ImageDecoder; +class GIFImageDecoder; #endif struct NativeImageSourcePtr { SkString m_url; PrivateAndroidImageSourceRec* m_image; #ifdef ANDROID_ANIMATED_GIF - ImageDecoder* m_gifDecoder; + GIFImageDecoder* m_gifDecoder; #endif }; typedef const Vector<char>* NativeBytePtr; diff --git a/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp index 1c488b3..65b2314 100644 --- a/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp @@ -423,9 +423,6 @@ bool ImageSource::frameHasAlphaAtIndex(size_t index) { #ifdef ANDROID_ANIMATED_GIF if (m_decoder.m_gifDecoder) { - if (!m_decoder.m_gifDecoder->supportsAlpha()) - return false; - ImageFrame* buffer = m_decoder.m_gifDecoder->frameBufferAtIndex(index); if (!buffer || buffer->status() == ImageFrame::FrameEmpty) |