third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp - Issue 2556723003: Merge color options into ColorBehavior

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 2556723003: Merge color options into ColorBehavior (Closed)

Patch Set: Feedback Created 4 years 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') | no next file with comments »
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 06f0a0d2f85eaa0894951d6d7269823ad7526798..3e005441cf16894891c5fd591148e74e89d4f57c 100644

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

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

@@ -2751,9 +2751,8 @@ void WebGLImageConversion::ImageExtractor::extractImage(bool premultiplyAlpha,

// Attempt to get raw unpremultiplied image data.

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

m_image->data(), true, ImageDecoder::AlphaNotPremultiplied,

- ignoreColorSpace ? ImageDecoder::ColorSpaceIgnored

- : ImageDecoder::ColorSpaceTransformed,

- ignoreColorSpace ? nullptr : ImageDecoder::globalTargetColorSpace()));

+ ignoreColorSpace ? ColorBehavior::ignore()

+ : ColorBehavior::transformToGlobalTarget()));

if (!decoder || !decoder->frameCount())

return;

ImageFrame* frame = decoder->frameBufferAtIndex(0);