third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp - Issue 2216073002: Color: Add ColorCorrectRendering flag

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 2216073002: Color: Add ColorCorrectRendering flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@decoder_profile

Patch Set: Rebase 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:

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 691e9e41b26c8f0a938387987311526742d7ca7c..874b7d06e12a3f288ac7c7d56ac845b6f1a6bcfa 100644

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

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

@@ -21,6 +21,7 @@

#include "platform/image-decoders/ImageDecoder.h"

#include "platform/PlatformInstrumentation.h"

+#include "platform/RuntimeEnabledFeatures.h"

#include "platform/graphics/BitmapImageMetrics.h"

#include "platform/image-decoders/bmp/BMPImageDecoder.h"

#include "platform/image-decoders/gif/GIFImageDecoder.h"

@@ -364,6 +365,10 @@ void ImageDecoder::setColorProfileAndComputeTransform(const char* iccData, unsig

m_colorProfile.assign(iccData, iccLength);

m_hasColorProfile = true;

+ // With color correct rendering, we use Skia instead of QCMS to color correct images.

+ if (RuntimeEnabledFeatures::colorCorrectRenderingEnabled())

+ return;

#if USE(QCMSLIB)

m_sourceToOutputDeviceColorTransform.reset();