third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp - Issue 1763043002: Add ColorspaceConversion in ImageBitmapOptions

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/core/imagebitmap/ImageBitmapFactories.cpp

Issue 1763043002: Add ColorspaceConversion in ImageBitmapOptions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: change tolerance to 13 Created 4 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/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-image-bitmap-from-video.html ('k') | third_party/WebKit/Source/core/imagebitmap/ImageBitmapOptions.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

diff --git a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

index 9c366300066c216cc2055652b6aa84ea156c3eed..acfb0f08663c24e785b9fe1d8eba7c5297e743c1 100644

--- a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

+++ b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

@@ -222,7 +222,10 @@ void ImageBitmapFactories::ImageBitmapLoader::decodeImageOnDecoderThread(WebTask

ImageDecoder::AlphaOption alphaOp = ImageDecoder::AlphaPremultiplied;

if (m_options.premultiplyAlpha() == "none")

alphaOp = ImageDecoder::AlphaNotPremultiplied;

- OwnPtr<ImageDecoder> decoder(ImageDecoder::create(*sharedBuffer, alphaOp, ImageDecoder::GammaAndColorProfileApplied));

+ ImageDecoder::GammaAndColorProfileOption colorspaceOp = ImageDecoder::GammaAndColorProfileApplied;

+ if (m_options.colorspaceConversion() == "none")

+ colorspaceOp = ImageDecoder::GammaAndColorProfileIgnored;

+ OwnPtr<ImageDecoder> decoder(ImageDecoder::create(*sharedBuffer, alphaOp, colorspaceOp));

RefPtr<SkImage> frame;

if (decoder) {

decoder->setData(sharedBuffer.get(), true);