| 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 f6226ad5280459df0d97419962401c65ca71ae2a..a473f4cc1cf0bc45cbcd7de4df60582f05fbaa40 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& scaledSize,
|
| + ImageDecoder::AlphaOption alphaOption,
|
| ImageDecoder** decoder) {
|
| ASSERT(decoder);
|
|
|
| MutexLocker lock(m_mutex);
|
| DecoderCacheMap::iterator iter = m_decoderCacheMap.find(
|
| - DecoderCacheEntry::makeCacheKey(generator, scaledSize));
|
| + DecoderCacheEntry::makeCacheKey(generator, scaledSize, alphaOption));
|
| if (iter == m_decoderCacheMap.end())
|
| return false;
|
|
|
|
|