Remove ImageSource::bytesDecodedToDetermineProperties() and fallout

Source/core/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 52 matching lines @@
         String filePath = WebKit::Platform::current()->unitTestSupport()->webKitRootDir();
         filePath.append(fileName);
         return WebKit::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 loadImage(const char* fileName)
     {
         RefPtr<SharedBuffer> imageData = readFile("/LayoutTests/fast/images/resources/animated-10color.gif");
         ASSERT_TRUE(imageData.get());
 
         m_image->setData(imageData, true);
-        EXPECT_EQ(0u, m_image->decodedSize());
+        EXPECT_EQ(0u, decodedSize());
 
         size_t frameCount = m_image->frameCount();
         for (size_t i = 0; i < frameCount; ++i)
             m_image->frameAtIndex(i);
     }
 
+    size_t decodedSize()
+    {
+        // In the context of this test, the following loop will give the correct result. But only because the test

[Peter Kasting, 2013/10/10 18:53:41]

Nit: result. But -> result, but

+        // forces all frames to be decoded in loadImage() above. There is no general guarantee that frameDecodedSize()
+        // is up-to-date. Because of how multi frame images (like GIF) works, requesting one frame to be decoded may

[Peter Kasting, 2013/10/10 18:53:41]

Nit: works -> work

+        // require other previous frames to be decoded as well. In those cases frameDecodedSize() wouldn't return the
+        // correct thing for the previous frame because the decoded size wouldn't have propagated upwards to the
+        // BitmapImage frame cache.
+        size_t size = 0;
+        for (size_t i = 0; i < decodedFramesCount(); ++i)
+            size += frameDecodedSize(i);
+        return size;
+    }
+
 protected:
     virtual void SetUp() OVERRIDE
     {
         m_image = BitmapImage::create(&m_imageObserver);
     }
 
     FakeImageObserver m_imageObserver;
     RefPtr<BitmapImage> m_image;
 };
 
 TEST_F(BitmapImageTest, destroyDecodedDataExceptCurrentFrame)
 {
     loadImage("/LayoutTests/fast/images/resources/animated-10color.gif");
-    size_t totalSize = m_image->decodedSize();
+    size_t totalSize = decodedSize();
     size_t frame = frameCount() / 2;
     setCurrentFrame(frame);
     size_t size = frameDecodedSize(frame);
     destroyDecodedData(false);
     EXPECT_LT(m_imageObserver.m_lastDecodedSizeChangedDelta, 0);
     EXPECT_GE(m_imageObserver.m_lastDecodedSizeChangedDelta, -static_cast<int>(totalSize - size));
 }
 
 TEST_F(BitmapImageTest, destroyAllDecodedData)
 {
     loadImage("/LayoutTests/fast/images/resources/animated-10color.gif");
-    size_t decodedSize = m_image->decodedSize();
-    EXPECT_GT(decodedSize, 0u);
+    size_t totalSize = decodedSize();
+    EXPECT_GT(totalSize, 0u);
     destroyDecodedData(true);
-    EXPECT_EQ(-static_cast<int>(decodedSize), m_imageObserver.m_lastDecodedSizeChangedDelta);
-    EXPECT_EQ(0u, m_image->decodedSize());
+    EXPECT_EQ(-static_cast<int>(totalSize), m_imageObserver.m_lastDecodedSizeChangedDelta);
+    EXPECT_EQ(0u, decodedSize());
 }
 
 } // namespace