| 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;
|
|
|
|
|