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

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

Patch Set: PNG alpha & partial decode fixes. 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/ImageDecoder.cpp ('K') | « third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.h » ('j') | third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a89c388b078d78d3507ebafda4a17ee1aa95f2d6..d8ed60b1c91a88bec7266d8645ba42dd390ff4ca 100644

--- a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

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

@@ -967,14 +967,6 @@ void JPEGImageDecoder::complete()

m_frameBufferCache[0].setStatus(ImageFrame::FrameComplete);

}

-inline bool isComplete(const JPEGImageDecoder* decoder, bool onlySize)

- if (decoder->hasImagePlanes() && !onlySize)

- return true;

- return decoder->frameIsCompleteAtIndex(0);

void JPEGImageDecoder::decode(bool onlySize)

{

if (failed())

@@ -991,7 +983,7 @@ void JPEGImageDecoder::decode(bool onlySize)

setFailed();

// If decoding is done or failed, we don't need the JPEGImageReader anymore.

- if (isComplete(this, onlySize) || failed())

+ if (frameIsCompleteAtIndex(0) || (hasImagePlanes() && !onlySize) || failed())

m_reader.clear();

}