Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(994)

Unified Diff: third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp

Issue 1962563002: Fix ImageDecoder::frameIsCompleteAtIndex - fully received instead of decoded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ASSERT if frameCount not called to parse before calling... Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp
index 457666d25dbf9719bca561b730007b49d180edd0..868fad70c6351f6875ccc8a97658a70566dd1a83 100644
--- a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp
@@ -83,9 +83,11 @@ int GIFImageDecoder::repetitionCount() const
return m_repetitionCount;
}
-bool GIFImageDecoder::frameIsCompleteAtIndex(size_t index) const
+bool GIFImageDecoder::frameIsFullyReceivedAtIndex(size_t index) const
{
- return m_reader && (index < m_reader->imagesCount()) && m_reader->frameContext(index)->isComplete();
+ ASSERT(m_haveUpdatedFrameCount);
+ return (m_reader && (index < m_reader->imagesCount()) && m_reader->frameContext(index)->isComplete())
+ || ImageDecoder::frameIsFullyReceivedAtIndex(index);
}
float GIFImageDecoder::frameDurationAtIndex(size_t index) const
@@ -296,8 +298,6 @@ void GIFImageDecoder::initializeNewFrame(size_t index)
void GIFImageDecoder::decode(size_t index)
{
scroggo_chromium 2016/06/02 21:00:14 Maybe assert here that we've updated the frame cou
aleksandar.stojiljkovic 2016/06/03 19:33:57 Done.
- parse(GIFFrameCountQuery);
-
if (failed())
return;

Powered by Google App Engine
This is Rietveld 408576698