third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp - Issue 2203903002: Color: Read embedded ICC profiles regardless of QCMS

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/graphics/gpu/WebGLImageConversion.cpp

Issue 2203903002: Color: Read embedded ICC profiles regardless of QCMS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add plumbing through to ImageFrame Created 4 years, 4 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/graphics/PictureSnapshot.cpp ('k') | third_party/WebKit/Source/platform/graphics/test/MockImageDecoder.h » ('j') | third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

index e294d1ffcbcc80f7936e30bb4d45f16b7e0f5584..ee437e3afa5d0f822aeeed91358e259623a1421e 100644

--- a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

+++ b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

@@ -2143,7 +2143,7 @@ void WebGLImageConversion::ImageExtractor::extractImage(bool premultiplyAlpha, b

// Attempt to get raw unpremultiplied image data.

std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(

ImageDecoder::determineImageType(*(m_image->data())), ImageDecoder::AlphaNotPremultiplied,

- ignoreGammaAndColorProfile ? ImageDecoder::GammaAndColorProfileIgnored : ImageDecoder::GammaAndColorProfileApplied));

+ ignoreGammaAndColorProfile ? ImageDecoder::GammaAndColorProfileNotApplied : ImageDecoder::GammaAndColorProfileApplied));

if (!decoder)

return;

decoder->setData(m_image->data(), true);