third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.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/ico/ICOImageDecoder.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

« third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp ('K') | « third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp » ('j') | third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

diff --git a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

index a189f8104505aafd491d1a17707f087b3fb92063..ab60f2af27df522a1641dab6cb0ca37868a66291 100644

--- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

+++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

@@ -147,7 +147,7 @@ void ICOImageDecoder::decode(size_t index, bool onlySize)

// If we're done decoding this frame, we don't need the BMPImageReader or

// PNGImageDecoder anymore. (If we failed, these have already been

// cleared.)

- } else if ((m_frameBufferCache.size() > index) && (m_frameBufferCache[index].getStatus() == ImageFrame::FrameComplete)) {

+ } else if (frameIsCompleteAtIndex(index)) {

m_bmpReaders[index].clear();

m_pngDecoders[index].clear();

}