diff options
author | Ben Murdoch <benm@google.com> | 2011-05-16 10:40:15 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-16 15:44:44 +0100 |
commit | 36185ec1f35de0b82ca4901f4b87a3f8a00c1562 (patch) | |
tree | b277bacd9a551e147c3168d2dc2ca9bf41edb9f5 /Source/WebCore | |
parent | 06e9fbfade43269305e2a80cab2689f9247c0232 (diff) | |
download | external_webkit-36185ec1f35de0b82ca4901f4b87a3f8a00c1562.zip external_webkit-36185ec1f35de0b82ca4901f4b87a3f8a00c1562.tar.gz external_webkit-36185ec1f35de0b82ca4901f4b87a3f8a00c1562.tar.bz2 |
Merge WebKit at r75993: Fix ImageSourceAndroid.cpp
RGBA32Buffer is now named ImageFrame.
See http://trac.webkit.org/changeset/75748
Change-Id: Id469057d2caa05c49f59ec489b39285dc3bf7763
Diffstat (limited to 'Source/WebCore')
-rw-r--r-- | Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp index 982302c..1c488b3 100644 --- a/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp @@ -378,9 +378,9 @@ SkBitmapRef* ImageSource::createFrameAtIndex(size_t index) { #ifdef ANDROID_ANIMATED_GIF if (m_decoder.m_gifDecoder) { - RGBA32Buffer* buffer = + ImageFrame* buffer = m_decoder.m_gifDecoder->frameBufferAtIndex(index); - if (!buffer || buffer->status() == RGBA32Buffer::FrameEmpty) + if (!buffer || buffer->status() == ImageFrame::FrameEmpty) return 0; SkBitmap& bitmap = buffer->bitmap(); SkPixelRef* pixelRef = bitmap.pixelRef(); @@ -401,9 +401,9 @@ float ImageSource::frameDurationAtIndex(size_t index) float duration = 0; #ifdef ANDROID_ANIMATED_GIF if (m_decoder.m_gifDecoder) { - RGBA32Buffer* buffer + ImageFrame* buffer = m_decoder.m_gifDecoder->frameBufferAtIndex(index); - if (!buffer || buffer->status() == RGBA32Buffer::FrameEmpty) + if (!buffer || buffer->status() == ImageFrame::FrameEmpty) return 0; duration = buffer->duration() / 1000.0f; } @@ -426,9 +426,9 @@ bool ImageSource::frameHasAlphaAtIndex(size_t index) if (!m_decoder.m_gifDecoder->supportsAlpha()) return false; - RGBA32Buffer* buffer = + ImageFrame* buffer = m_decoder.m_gifDecoder->frameBufferAtIndex(index); - if (!buffer || buffer->status() == RGBA32Buffer::FrameEmpty) + if (!buffer || buffer->status() == ImageFrame::FrameEmpty) return false; return buffer->hasAlpha(); @@ -454,9 +454,9 @@ bool ImageSource::frameIsCompleteAtIndex(size_t index) { #ifdef ANDROID_ANIMATED_GIF if (m_decoder.m_gifDecoder) { - RGBA32Buffer* buffer = + ImageFrame* buffer = m_decoder.m_gifDecoder->frameBufferAtIndex(index); - return buffer && buffer->status() == RGBA32Buffer::FrameComplete; + return buffer && buffer->status() == ImageFrame::FrameComplete; } #else SkASSERT(0 == index); |