third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp - Issue 1962563002: Fix ImageDecoder::frameIsCompleteAtIndex - fully received instead of decoded.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: rebase Created 4 years, 6 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

« no previous file with comments | « third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.h ('k') | third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 2cae67e0a9f1d413a973a22988c768fe3a689094..03668a73b66cf3fd279f7daa690159709dbeee8e 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();

+ DCHECK(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,7 @@ void GIFImageDecoder::initializeNewFrame(size_t index)

void GIFImageDecoder::decode(size_t index)

{

- parse(GIFFrameCountQuery);

+ DCHECK(haveUpdatedFrameCount());

if (failed())

return;