diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
| commit | 1edef79f87f9c52c21d69c87c19f8e2b140a9119 (patch) | |
| tree | cad337ef493b0d9710bf3ae478cb87cb534f598d /WebCore/platform/image-decoders/skia/GIFImageDecoder.cpp | |
| parent | b83fc086000e27bc227580bd0e35b9d7bee1179a (diff) | |
| parent | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (diff) | |
| download | external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.zip external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.gz external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.bz2 | |
Merge commit 'goog/master-webkit-merge' into webkit-merge-44544
Diffstat (limited to 'WebCore/platform/image-decoders/skia/GIFImageDecoder.cpp')
| -rw-r--r-- | WebCore/platform/image-decoders/skia/GIFImageDecoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/image-decoders/skia/GIFImageDecoder.cpp b/WebCore/platform/image-decoders/skia/GIFImageDecoder.cpp index 2d77943..c03452a 100644 --- a/WebCore/platform/image-decoders/skia/GIFImageDecoder.cpp +++ b/WebCore/platform/image-decoders/skia/GIFImageDecoder.cpp @@ -126,7 +126,7 @@ bool GIFImageDecoder::isSizeAvailable() const decode(GIFSizeQuery, 0); } - return !m_failed && ImageDecoder::isSizeAvailable(); + return ImageDecoder::isSizeAvailable(); } // The total number of frames for the image. Will scan the image data for the answer @@ -183,7 +183,7 @@ RGBA32Buffer* GIFImageDecoder::frameBufferAtIndex(size_t index) RGBA32Buffer& frame = m_frameBufferCache[index]; if (frame.status() != RGBA32Buffer::FrameComplete && m_reader) - decode(GIFFullQuery, index+1); // Decode this frame. + decode(GIFFullQuery, index + 1); // Decode this frame. return &frame; } |