third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.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/image-decoders/webp/WEBPImageDecoder.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/image-decoders/webp/WEBPImageDecoder.h ('k') | third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp

diff --git a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp

index bbfec458fc8a48a2ca2e4ebb2493f0c1a93202d0..c9045baf3561de6a1fa4434701bbc638bda8cf33 100644

--- a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp

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

@@ -117,13 +117,9 @@ void alphaBlendNonPremultiplied(blink::ImageFrame& src,

namespace blink {

WEBPImageDecoder::WEBPImageDecoder(AlphaOption alphaOption,

- ColorSpaceOption colorOptions,

- sk_sp<SkColorSpace> targetColorSpace,

+ const ColorBehavior& colorBehavior,

size_t maxDecodedBytes)

- : ImageDecoder(alphaOption,

- colorOptions,

- std::move(targetColorSpace),

- maxDecodedBytes),

+ : ImageDecoder(alphaOption, colorBehavior, maxDecodedBytes),

m_decoder(0),

m_formatFlags(0),

m_frameBackgroundHasAlpha(false),