Decode GIF image frames on demand.

Source/WebKit/chromium/tests/GIFImageDecoderTest.cpp

Index: Source/WebKit/chromium/tests/GIFImageDecoderTest.cpp
diff --git a/Source/WebKit/chromium/tests/GIFImageDecoderTest.cpp b/Source/WebKit/chromium/tests/GIFImageDecoderTest.cpp
index e7e7172fde2ff5c1674af90bc0e2a7fc429499de..d90293391e1512445a7b77624eca133fa07cc2fb 100644
--- a/Source/WebKit/chromium/tests/GIFImageDecoderTest.cpp
+++ b/Source/WebKit/chromium/tests/GIFImageDecoderTest.cpp
@@ -32,17 +32,17 @@
 
 #include "core/platform/image-decoders/gif/GIFImageDecoder.h"
 
-#include <gtest/gtest.h>
 #include "core/platform/FileSystem.h"
 #include "core/platform/SharedBuffer.h"
+#include "wtf/OwnPtr.h"

[Alpha Left Google, 2013/05/22 20:18:09]

nit: I'm not sure whether we are moving to use "wtf/..." instead of <wtf/...>.
Other core files seem to remaing using <wtf/...>.

[Xianzhu, 2013/05/22 23:43:29]

Yes, this is the new style. The presubmit script reports errors for <wtf/...>.
For now it seems only changed files need to update this.

+#include "wtf/PassOwnPtr.h"
+#include "wtf/StringHasher.h"
+#include "wtf/Vector.h"
+#include <gtest/gtest.h>
 #include <public/Platform.h>
 #include <public/WebData.h>
 #include <public/WebSize.h>
 #include <public/WebUnitTestSupport.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/StringHasher.h>
-#include <wtf/Vector.h>
 
 using namespace WebCore;
 using namespace WebKit;
@@ -135,7 +135,7 @@ TEST(GIFImageDecoderTest, parseByteByByte)
     size_t frameCount = 0;
 
     // Pass data to decoder byte by byte.
-    for (unsigned length = 1; length <= data->size(); ++length) {
+    for (size_t length = 1; length <= data->size(); ++length) {
         RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), length);
         decoder->setData(tempData.get(), length == data->size());
 
@@ -161,7 +161,7 @@ TEST(GIFImageDecoderTest, parseAndDecodeByteByByte)
     size_t framesDecoded = 0;
 
     // Pass data to decoder byte by byte.
-    for (unsigned length = 1; length <= data->size(); ++length) {
+    for (size_t length = 1; length <= data->size(); ++length) {
         RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), length);
         decoder->setData(tempData.get(), length == data->size());
 
@@ -241,6 +241,74 @@ TEST(GIFImageDecoderTest, progressiveDecode)
     EXPECT_TRUE(match);
 }
 
+TEST(GIFImageDecoderTest, randomFrameDecode)
+{
+    RefPtr<SharedBuffer> fullData = readFile("/Source/WebKit/chromium/tests/data/radient.gif");
+    ASSERT_TRUE(fullData.get());
+
+    OwnPtr<GIFImageDecoder> decoder;
+
+    // Compute hashes when the frames are requested sequentially.

[Alpha Left Google, 2013/05/22 20:18:09]

This is not really random isn't it?

[Xianzhu, 2013/05/22 23:43:29]

This is to get a baseline for testing the random decoding case. Moved it to a
utility function.

+    decoder = createDecoder();
+    decoder->setData(fullData.get(), true);
+    decoder->frameBufferAtIndex(0); // To trigger parsing.

[Alpha Left Google, 2013/05/22 20:18:09]

frameCount() will trigger parsing already.

[Xianzhu, 2013/05/22 23:43:29]

Done.

+    size_t frameCount = decoder->frameCount();
+    Vector<unsigned> sequentialHashes(frameCount);
+    for (size_t i = 0; i < frameCount; ++i) {
+        ImageFrame* frame = decoder->frameBufferAtIndex(i);
+        sequentialHashes[i] = hashSkBitmap(frame->getSkBitmap());
+    }
+
+    // Compute hashes when frames are requested randomly.
+    decoder = createDecoder();
+    decoder->setData(fullData.get(), true);
+    const size_t skippingStep = 5;
+    for (size_t i = 0; i < skippingStep; ++i) {
+        for (size_t j = i; j < frameCount; j += skippingStep) {
+            ImageFrame* frame = decoder->frameBufferAtIndex(j);
+            EXPECT_EQ(sequentialHashes[j], hashSkBitmap(frame->getSkBitmap()));
+        }
+    }
+
+    // Compute hashes when frames are requested in reverse order.
+    decoder = createDecoder();
+    decoder->setData(fullData.get(), true);
+    for (size_t i = frameCount; i; --i) {
+        ImageFrame* frame = decoder->frameBufferAtIndex(i - 1);
+        EXPECT_EQ(sequentialHashes[i - 1], hashSkBitmap(frame->getSkBitmap()));
+    }
+}
+
+TEST(GIFImageDecoderTest, decodeAfterClearFrameBufferCache)
+{
+    RefPtr<SharedBuffer> fullData = readFile("/Source/WebKit/chromium/tests/data/radient.gif");
+    ASSERT_TRUE(fullData.get());
+
+    OwnPtr<GIFImageDecoder> decoder;
+
+    // Compute hashes when the frames are requested sequentially.
+    decoder = createDecoder();
+    decoder->setData(fullData.get(), true);
+    decoder->frameBufferAtIndex(0); // To trigger parsing.

[Alpha Left Google, 2013/05/22 20:18:09]

frameCount() will trigger parsing so this is not necessary.

[Xianzhu, 2013/05/22 23:43:29]

Done.

+    size_t frameCount = decoder->frameCount();
+    Vector<unsigned> sequentialHashes(frameCount);
+    for (size_t i = 0; i < frameCount; ++i) {
+        ImageFrame* frame = decoder->frameBufferAtIndex(i);
+        sequentialHashes[i] = hashSkBitmap(frame->getSkBitmap());
+    }
+
+    for (size_t clearExceptFrame = 0; clearExceptFrame < frameCount; ++clearExceptFrame) {
+        decoder->clearFrameBufferCache(clearExceptFrame);
+        const size_t skippingStep = 5;
+        for (size_t i = 0; i < skippingStep; ++i) {
+            for (size_t j = 0; j < frameCount; j += skippingStep) {
+                ImageFrame* frame = decoder->frameBufferAtIndex(j);
+                EXPECT_EQ(sequentialHashes[j], hashSkBitmap(frame->getSkBitmap()));
+            }
+        }
+    }
+}
+

[Alpha Left Google, 2013/05/22 20:18:09]

You also need to test this corner case:
1. Frame 1 is partially decoded.
2. Skip to decode other frames and then clear.
3. Come back to resume decoding frame 1.

[Xianzhu, 2013/05/22 23:43:29]

Done.

 TEST(GIFImageDecoderTest, allDataReceivedTruncation)
 {
     OwnPtr<GIFImageDecoder> decoder(createDecoder());