diff options
| author | Steve Block <steveblock@google.com> | 2011-05-19 12:40:55 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-19 13:00:07 +0100 |
| commit | bc1021c1924cd3daeefe88111a63dab7b6a9bf03 (patch) | |
| tree | 70e684504584bd006b5690f26040117ef4f2b726 | |
| parent | 5dc3f82ee1d379f4df8606cdf60369965b44486c (diff) | |
| download | external_webkit-bc1021c1924cd3daeefe88111a63dab7b6a9bf03.zip external_webkit-bc1021c1924cd3daeefe88111a63dab7b6a9bf03.tar.gz external_webkit-bc1021c1924cd3daeefe88111a63dab7b6a9bf03.tar.bz2 | |
ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need to check supportsAlpha()
GIFImageDecoder::supportsAlpha() always returns true and this method
will be removed in http://trac.webkit.org/changeset/77427, so updating
our code now to avoid problems later.
Change-Id: I2a6500608eb661ee50a7ed315e7ece49508d0f82
| -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) |