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& scaled_size,
+                                     ImageDecoder::AlphaOption alpha_option,
                                      ImageDecoder** decoder) {
   DCHECK(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;
 
   DecoderCacheEntry* cache_entry = iter->value.get();
 
   // There can only be one user of a decoder at a time.
   DCHECK(!cache_entry->UseCount());
   cache_entry->IncrementUseCount();
   *decoder = cache_entry->CachedDecoder();
   return true;
@@ skipping 220 matching lines @@
   }
 }
 
 void ImageDecodingStore::RemoveFromCacheListInternal(
     const Vector<std::unique_ptr<CacheEntry>>& deletion_list) {
   for (size_t i = 0; i < deletion_list.size(); ++i)
     ordered_cache_list_.Remove(deletion_list[i].get());
 }
 
 }  // namespace blink