Respect colorSpace in DecodingImageGenerator::onGetPixels()

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

Index: third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp b/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
index 5682367514db1b8ec12669bb9a63b787f584448c..ad5f982836faa99406ec283a1db438619829057a 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
@@ -37,8 +37,8 @@ class ImageDecodingStoreTest : public ::testing::Test,
  public:
   void SetUp() override {
     ImageDecodingStore::instance().setCacheLimitInBytes(1024 * 1024);
-    m_generator = ImageFrameGenerator::create(SkISize::Make(100, 100), true,
-                                              ColorBehavior::ignore());
+    m_generator = ImageFrameGenerator::create(
+        SkImageInfo::MakeN32Premul(100, 100), true, ColorBehavior::ignore());
     m_decodersDestroyed = 0;
   }
 
@@ -83,8 +83,8 @@ TEST_F(ImageDecodingStoreTest, insertDecoder) {
   EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes());
 
   ImageDecoder* testDecoder;
-  EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(),
-                                                         size, &testDecoder));
+  EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(
+      m_generator.get(), size, ImageDecoder::AlphaPremultiplied, &testDecoder));
   EXPECT_TRUE(testDecoder);
   EXPECT_EQ(refDecoder, testDecoder);
   ImageDecodingStore::instance().unlockDecoder(m_generator.get(), testDecoder);
@@ -137,7 +137,8 @@ TEST_F(ImageDecodingStoreTest, decoderInUseNotEvicted) {
 
   ImageDecoder* testDecoder;
   EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(
-      m_generator.get(), SkISize::Make(2, 2), &testDecoder));
+      m_generator.get(), SkISize::Make(2, 2), ImageDecoder::AlphaPremultiplied,
+      &testDecoder));
 
   evictOneCache();
   evictOneCache();
@@ -162,15 +163,15 @@ TEST_F(ImageDecodingStoreTest, removeDecoder) {
   EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes());
 
   ImageDecoder* testDecoder;
-  EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(),
-                                                         size, &testDecoder));
+  EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(
+      m_generator.get(), size, ImageDecoder::AlphaPremultiplied, &testDecoder));
   EXPECT_TRUE(testDecoder);
   EXPECT_EQ(refDecoder, testDecoder);
   ImageDecodingStore::instance().removeDecoder(m_generator.get(), testDecoder);
   EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries());
 
-  EXPECT_FALSE(ImageDecodingStore::instance().lockDecoder(m_generator.get(),
-                                                          size, &testDecoder));
+  EXPECT_FALSE(ImageDecodingStore::instance().lockDecoder(
+      m_generator.get(), size, ImageDecoder::AlphaPremultiplied, &testDecoder));
 }
 
 }  // namespace blink