third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp - Issue 2523943002: Explicitly specify target color space to ImageDecoder at creation

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/bmp/BMPImageDecoder.cpp

Issue 2523943002: Explicitly specify target color space to ImageDecoder at creation (Closed)

Patch Set: Rebase Created 4 years, 1 month 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/bmp/BMPImageDecoder.h ('k') | third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp

diff --git a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp

index ad39b9977d50c72fcbd39637165fd7e1bb19126f..eb034f26741bef9d6975c834778da0c270a54d51 100644

--- a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp

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

@@ -42,8 +42,12 @@ static const size_t sizeOfFileHeader = 14;

BMPImageDecoder::BMPImageDecoder(AlphaOption alphaOption,

ColorSpaceOption colorOptions,

+ sk_sp<SkColorSpace> targetColorSpace,

size_t maxDecodedBytes)

- : ImageDecoder(alphaOption, colorOptions, maxDecodedBytes),

+ : ImageDecoder(alphaOption,

+ colorOptions,

+ std::move(targetColorSpace),

+ maxDecodedBytes),

m_decodedOffset(0) {}

void BMPImageDecoder::onSetData(SegmentReader* data) {