Remove DeferredImageDecoder::setEnabled and ImageDecoder::deferredImageDecodingEnabled

third_party/WebKit/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 48 matching lines @@
         void didDraw(const Image*) override { }
         bool shouldPauseAnimation(const Image*) override { return false; }
         void animationAdvanced(const Image*) override { }
 
         virtual void changedInRect(const Image*, const IntRect&) { }
 
         size_t m_lastDecodedSize;
         int m_lastDecodedSizeChangedDelta;
     };
 
-    BitmapImageTest() : BitmapImageTest(false) { }
-    BitmapImageTest(bool enableDeferredDecoding) : m_enableDeferredDecoding(enableDeferredDecoding) { }
-
     static PassRefPtr<SharedBuffer> readFile(const char* fileName)
     {
         String filePath = testing::blinkRootDir();
         filePath.append(fileName);
         return testing::readFromFile(filePath);
     }
 
     // Accessors to BitmapImage's protected methods.
     void destroyDecodedData() { m_image->destroyDecodedData(); }
     size_t frameCount() { return m_image->frameCount(); }
@@ skipping 57 matching lines @@
     }
 
     int lastDecodedSizeChange()
     {
         return m_imageObserver->m_lastDecodedSizeChangedDelta;
     }
 
 protected:
     void SetUp() override
     {
-        DeferredImageDecoder::setEnabled(m_enableDeferredDecoding);
         m_imageObserver = new FakeImageObserver;
         m_image = BitmapImage::create(m_imageObserver.get());
     }
 
     Persistent<FakeImageObserver> m_imageObserver;
     RefPtr<BitmapImage> m_image;
-
-private:
-    bool m_enableDeferredDecoding;
 };
 
 TEST_F(BitmapImageTest, destroyDecodedData)
 {
     loadImage("/LayoutTests/fast/images/resources/animated-10color.gif");
     size_t totalSize = decodedSize();
     EXPECT_GT(totalSize, 0u);
     destroyDecodedData();
     EXPECT_EQ(-static_cast<int>(totalSize), lastDecodedSizeChange());
     EXPECT_EQ(0u, decodedSize());
@@ skipping 84 matching lines @@
 
 TEST_F(BitmapImageTest, icoHasWrongFrameDimensions)
 {
     loadImage("/LayoutTests/fast/images/resources/wrong-frame-dimensions.ico");
     // This call would cause crash without fix for 408026
     imageForDefaultFrame();
 }
 
 TEST_F(BitmapImageTest, correctDecodedDataSize)
 {
-    // When requesting a frame of a multi-frame GIF causes another frame to be
-    // decoded as well, both frames' sizes should be reported by the source and
-    // thus included in the decoded size changed notification.
+    // Requesting any one frame shouldn't result in decoding any other frames.
     loadImage("/LayoutTests/fast/images/resources/anim_none.gif", false);
     frameAtIndex(1);
     int frameSize = static_cast<int>(m_image->size().area() * sizeof(ImageFrame::PixelData));
-    EXPECT_EQ(frameSize * 2, lastDecodedSizeChange());

[chrishtr, 2016/06/08 20:02:12]

Why did this change?

[hajimehoshi, 2016/06/09 04:02:38]

It's because the original test assumed that
DeferredImageDecoder::setEnabled(false), which I'm trying to remove. This now
equals to BitmapImageDeferredDecodingTest.correctDecodedDataSize in the original
code.

+    EXPECT_EQ(frameSize, lastDecodedSizeChange());
 }
 
 TEST_F(BitmapImageTest, recachingFrameAfterDataChanged)
 {
     loadImage("/LayoutTests/fast/images/resources/green.jpg");
     setFirstFrameNotComplete();
     EXPECT_GT(lastDecodedSizeChange(), 0);
     m_imageObserver->m_lastDecodedSizeChangedDelta = 0;
 
     // Calling dataChanged causes the cache to flush, but doesn't affect the
     // source's decoded frames. It shouldn't affect decoded size.
     m_image->dataChanged(true);
     EXPECT_EQ(0, lastDecodedSizeChange());
     // Recaching the first frame also shouldn't affect decoded size.
     m_image->imageForCurrentFrame();
     EXPECT_EQ(0, lastDecodedSizeChange());
 }
 
-class BitmapImageDeferredDecodingTest : public BitmapImageTest {
-public:
-    BitmapImageDeferredDecodingTest() : BitmapImageTest(true) { }
-};
-
-TEST_F(BitmapImageDeferredDecodingTest, correctDecodedDataSize)
-{
-    // When deferred decoding is enabled, requesting any one frame shouldn't
-    // result in decoding any other frames.
-    loadImage("/LayoutTests/fast/images/resources/anim_none.gif", false);
-    frameAtIndex(1);
-    int frameSize = static_cast<int>(m_image->size().area() * sizeof(ImageFrame::PixelData));
-    EXPECT_EQ(frameSize, lastDecodedSizeChange());
-}
-
 template <typename HistogramEnumType>
 struct HistogramTestParams {
     const char* filename;
     HistogramEnumType type;
 };
 
 template <typename HistogramEnumType>
 class BitmapHistogramTest
     : public BitmapImageTest
     , public ::testing::WithParamInterface<HistogramTestParams<HistogramEnumType>> {
@@ skipping 40 matching lines @@
     {"/LayoutTests/fast/images/resources/exif-orientation-5-lu.jpg", OriginLeftTop},
     {"/LayoutTests/fast/images/resources/exif-orientation-6-ru.jpg", OriginRightTop},
     {"/LayoutTests/fast/images/resources/exif-orientation-7-rl.jpg", OriginRightBottom},
     {"/LayoutTests/fast/images/resources/exif-orientation-8-llo.jpg", OriginLeftBottom}
 };
 
 INSTANTIATE_TEST_CASE_P(DecodedImageOrientationHistogramTest, DecodedImageOrientationHistogramTest,
     ::testing::ValuesIn(kDecodedImageOrientationHistogramTestParams));
 
 } // namespace blink