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

Issue 1962563002: Fix ImageDecoder::frameIsCompleteAtIndex - fully received instead of decoded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: BMPDecoder + remove partial 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/graphics/test/MockImageDecoder.h ('K') | « third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h ('k') | third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp » ('j') | third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 70de78249db332997998e3edd75e1cd5195529e1..91094d41c0dfe64147bf92cbb088985e2ccc26e3 100644

--- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp

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

@@ -144,13 +144,12 @@ ImageFrame* ImageDecoder::frameBufferAtIndex(size_t index)

bool ImageDecoder::frameHasAlphaAtIndex(size_t index) const

{

- return !frameIsCompleteAtIndex(index) || m_frameBufferCache[index].hasAlpha();

+ return index >= m_frameBufferCache.size() || m_frameBufferCache[index].hasAlpha();

}

-bool ImageDecoder::frameIsCompleteAtIndex(size_t index) const

+bool ImageDecoder::frameIsFullyReceivedAtIndex(size_t index) const

{

- return (index < m_frameBufferCache.size()) &&

- (m_frameBufferCache[index].getStatus() == ImageFrame::FrameComplete);

+ return m_isAllDataReceived || failed();

}

size_t ImageDecoder::frameBytesAtIndex(size_t index) const