third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h - 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/ico/ICOImageDecoder.h

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

Index: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h

diff --git a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h

index 1b93fab56851f9c096eb126e95ea8a90a34bed30..a24bdece4f2b89386eacc635d8c8e71e06905429 100644

--- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h

+++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.h

@@ -44,10 +44,7 @@ class PLATFORM_EXPORT ICOImageDecoder final : public ImageDecoder {

WTF_MAKE_NONCOPYABLE(ICOImageDecoder);

public:

- ICOImageDecoder(AlphaOption,

- ColorSpaceOption,

- sk_sp<SkColorSpace>,

- size_t maxDecodedBytes);

+ ICOImageDecoder(AlphaOption, const ColorBehavior&, size_t maxDecodedBytes);

~ICOImageDecoder() override;

// ImageDecoder:

@@ -181,7 +178,7 @@ class PLATFORM_EXPORT ICOImageDecoder final : public ImageDecoder {

IntSize m_frameSize;

// Used to pass on to an internally created PNG decoder.

- const ColorSpaceOption m_colorSpaceOption;

+ const ColorBehavior m_colorBehavior;

};

} // namespace blink