third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp - Issue 2462803002: Plumb color space to DecodingImageGenerator and ImageFrameGenerator

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/bmp/BMPImageReader.cpp

Issue 2462803002: Plumb color space to DecodingImageGenerator and ImageFrameGenerator (Closed)

Patch Set: Don't tag images just yet Created 4 years, 2 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/ImageFrame.cpp ('K') | « third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a3a488f30d549328f8355fb75b56a66ea9daf13e..3f056258bc017e7f1d0aff16327a45ebe7d4536e 100644

--- a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp

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

@@ -121,8 +121,10 @@ bool BMPImageReader::decodeBMP(bool onlySize) {

ASSERT(m_buffer); // Parent should set this before asking us to decode!

if (m_buffer->getStatus() == ImageFrame::FrameEmpty) {

if (!m_buffer->setSizeAndColorSpace(m_parent->size().width(),

- m_parent->size().height(), nullptr))

+ m_parent->size().height(),

+ m_parent->colorSpace())) {

Justin Novosad 2016/10/31 14:55:13 don't we want to do this only if colorCorrectRende

ccameron 2016/10/31 18:10:18 Tagging input color spaces should have no effect,

return m_parent->setFailed(); // Unable to allocate.

+ }

m_buffer->setStatus(ImageFrame::FramePartial);

// setSize() calls eraseARGB(), which resets the alpha flag, so we force

// it back to false here. We'll set it true below in all cases where