third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp - Issue 2749703002: Refactor ImageFrame::setSizeAndColorSpace()

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 2749703002: Refactor ImageFrame::setSizeAndColorSpace() (Closed)

Patch Set: Moving to another CR the separation of zeroing pixel data from setting alpha Created 3 years, 9 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/bmp/BMPImageReader.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp » ('j') | no next file with comments »
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 641012756bc353bc3cce7b30e28e29cc6acd17a1..a0278445f7355aec98e2dd230d6c9837877a67a5 100644

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

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

@@ -937,10 +937,11 @@ bool JPEGImageDecoder::outputScanlines() {

DCHECK_EQ(info->output_height,

static_cast<JDIMENSION>(m_decodedSize.height()));

- if (!buffer.setSizeAndColorSpace(info->output_width, info->output_height,

- colorSpaceForSkImages()))

+ if (!buffer.allocatePixelData(info->output_width, info->output_height,

+ colorSpaceForSkImages()))

return setFailed();

+ buffer.zeroFillPixelData();

// The buffer is transparent outside the decoded area while the image is

// loading. The image will be marked fully opaque in complete().

buffer.setStatus(ImageFrame::FramePartial);