Don't cache any SkBitmaps in DeferredImageDecoder

Source/platform/graphics/BitmapImageTest.cpp

 /*
  * Copyright (c) 2013, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 55 matching lines @@
         filePath.append(fileName);
         return Platform::current()->unitTestSupport()->readFromFile(filePath);
     }
 
     // Accessors to BitmapImage's protected methods.
     void destroyDecodedData(bool destroyAll) { m_image->destroyDecodedData(destroyAll); }
     size_t frameCount() { return m_image->frameCount(); }
     void setCurrentFrame(size_t frame) { m_image->m_currentFrame = frame; }
     size_t frameDecodedSize(size_t frame) { return m_image->m_frames[frame].m_frameBytes; }
     size_t decodedFramesCount() const { return m_image->m_frames.size(); }
-    void resetDecoder() { return m_image->resetDecoder(); }
 
     void loadImage(const char* fileName)
     {
         RefPtr<SharedBuffer> imageData = readFile(fileName);
         ASSERT_TRUE(imageData.get());
 
         m_image->setData(imageData, true);
         EXPECT_EQ(0u, decodedSize());
 
         size_t frameCount = m_image->frameCount();
@@ skipping 94 matching lines @@
 
     image->setData(SharedBuffer::create("data", sizeof("data")), false);
     EXPECT_FALSE(image->isAllDataReceived());
 
     image->setData(imageData, true);
     EXPECT_TRUE(image->isAllDataReceived());
 }
 
 #if USE(QCMSLIB)
 
+TEST_F(BitmapImageTest, noColorProfile)
+{
+    loadImage("/LayoutTests/fast/images/resources/green.jpg");
+    EXPECT_EQ(1u, decodedFramesCount());
+    EXPECT_EQ(1024u, decodedSize());
+    EXPECT_FALSE(m_image->hasColorProfile());
+}
+
 TEST_F(BitmapImageTest, jpegHasColorProfile)
 {
     loadImage("/LayoutTests/fast/images/resources/icc-v2-gbr.jpg");
     EXPECT_EQ(1u, decodedFramesCount());
     EXPECT_EQ(227700u, decodedSize());
     EXPECT_TRUE(m_image->hasColorProfile());
 
-    resetDecoder();
     destroyDecodedData(true);
-
-    loadImage("/LayoutTests/fast/images/resources/green.jpg");
-    EXPECT_EQ(1u, decodedFramesCount());
-    EXPECT_EQ(1024u, decodedSize());
-    EXPECT_FALSE(m_image->hasColorProfile());
 }
 
 TEST_F(BitmapImageTest, pngHasColorProfile)
 {
     loadImage("/LayoutTests/fast/images/resources/palatted-color-png-gamma-one-color-profile.png");
     EXPECT_EQ(1u, decodedFramesCount());
     EXPECT_EQ(65536u, decodedSize());
     EXPECT_TRUE(m_image->hasColorProfile());
 
-    resetDecoder();
     destroyDecodedData(true);
-
-    loadImage("/LayoutTests/fast/images/resources/green.jpg");
-    EXPECT_EQ(1u, decodedFramesCount());
-    EXPECT_EQ(1024u, decodedSize());
-    EXPECT_FALSE(m_image->hasColorProfile());
 }
 
 TEST_F(BitmapImageTest, webpHasColorProfile)
 {
     loadImage("/LayoutTests/fast/images/resources/webp-color-profile-lossy.webp");
     EXPECT_EQ(1u, decodedFramesCount());
     EXPECT_EQ(2560000u, decodedSize());
     EXPECT_TRUE(m_image->hasColorProfile());
 
     destroyDecodedData(true);
-    resetDecoder();
-
-    loadImage("/LayoutTests/fast/images/resources/test.webp");
-    EXPECT_EQ(1u, decodedFramesCount());
-    EXPECT_EQ(65536u, decodedSize());
-    EXPECT_FALSE(m_image->hasColorProfile());
 }
 
 TEST_F(BitmapImageTest, icoHasWrongFrameDimensions)
 {
     loadImage("/LayoutTests/fast/images/resources/wrong-frame-dimensions.ico");
     // This call would cause crash without fix for 408026
     imageForDefaultFrame();
 }
 
 #endif // USE(QCMSLIB)
 
 } // namespace blink