Respect colorSpace in DecodingImageGenerator::onGetPixels()

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 41 matching lines @@
 }
 
 ImageDecodingStore& ImageDecodingStore::instance() {
   DEFINE_THREAD_SAFE_STATIC_LOCAL(ImageDecodingStore, store,
                                   ImageDecodingStore::create().release());
   return store;
 }
 
 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;
 
   DecoderCacheEntry* cacheEntry = iter->value.get();
 
   // There can only be one user of a decoder at a time.
   ASSERT(!cacheEntry->useCount());
   cacheEntry->incrementUseCount();
   *decoder = cacheEntry->cachedDecoder();
   return true;
@@ skipping 218 matching lines @@
   }
 }
 
 void ImageDecodingStore::removeFromCacheListInternal(
     const Vector<std::unique_ptr<CacheEntry>>& deletionList) {
   for (size_t i = 0; i < deletionList.size(); ++i)
     m_orderedCacheList.remove(deletionList[i].get());
 }
 
 }  // namespace blink