third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp - Issue 2787053004: Respect colorSpace in DecodingImageGenerator::onGetPixels()

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/ImageDecodingStore.cpp

Issue 2787053004: Respect colorSpace in DecodingImageGenerator::onGetPixels() (Closed)

Patch Set: Write custom hash impl for DecoderCacheKey struct Created 3 years, 8 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:

Index: third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp b/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp

index a92b37e59e3c9343002b281fa7ea171b8a2a5c49..d24117600b39914b00bb3dd02734929db6f03015 100644

--- a/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp

+++ b/third_party/WebKit/Source/platform/graphics/ImageDecodingStore.cpp

@@ -59,12 +59,13 @@ ImageDecodingStore& ImageDecodingStore::Instance() {

bool ImageDecodingStore::LockDecoder(const ImageFrameGenerator* generator,

const SkISize& scaled_size,

+ ImageDecoder::AlphaOption alpha_option,

ImageDecoder** decoder) {

ASSERT(decoder);

MutexLocker lock(mutex_);

DecoderCacheMap::iterator iter = decoder_cache_map_.Find(

- DecoderCacheEntry::MakeCacheKey(generator, scaled_size));

+ DecoderCacheEntry::MakeCacheKey(generator, scaled_size, alpha_option));

if (iter == decoder_cache_map_.end())

return false;