| 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..1d193157203392cf1e5bd143cba500948dc4c877 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"
|
| +#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;
|
| @@ -78,6 +78,17 @@ static unsigned hashSkBitmap(const SkBitmap& bitmap)
|
| return StringHasher::hashMemory(bitmap.getPixels(), bitmap.getSize());
|
| }
|
|
|
| +static void createDecodingBaseline(SharedBuffer* data, Vector<unsigned>* baselineHashes)
|
| +{
|
| + OwnPtr<GIFImageDecoder> decoder(createDecoder());
|
| + decoder->setData(data, true);
|
| + size_t frameCount = decoder->frameCount();
|
| + for (size_t i = 0; i < frameCount; ++i) {
|
| + ImageFrame* frame = decoder->frameBufferAtIndex(i);
|
| + baselineHashes->append(hashSkBitmap(frame->getSkBitmap()));
|
| + }
|
| +}
|
| +
|
| TEST(GIFImageDecoderTest, decodeTwoFrames)
|
| {
|
| OwnPtr<GIFImageDecoder> decoder(createDecoder());
|
| @@ -135,7 +146,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 +172,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());
|
|
|
| @@ -297,6 +308,137 @@ TEST(GIFImageDecoderTest, frameIsCompleteLoading)
|
| EXPECT_TRUE(decoder->frameIsCompleteAtIndex(1));
|
| }
|
|
|
| +TEST(GIFImageDecoderTest, updateRequiredPreviousFrameAfterFirstDecode)
|
| +{
|
| + OwnPtr<GIFImageDecoder> decoder(createDecoder());
|
| +
|
| + RefPtr<SharedBuffer> fullData = readFile("/LayoutTests/fast/images/resources/animated-10color.gif");
|
| + ASSERT_TRUE(fullData.get());
|
| +
|
| + // Give it data that is enough to parse but not decode in order to check the status
|
| + // of requiredPreviousFrameIndex before decoding.
|
| + size_t partialSize = 1;
|
| + do {
|
| + RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), partialSize);
|
| + decoder->setData(data.get(), false);
|
| + ++partialSize;
|
| + } while (!decoder->frameCount() || decoder->frameBufferAtIndex(0)->status() == ImageFrame::FrameEmpty);
|
| +
|
| + EXPECT_EQ(notFound, decoder->frameBufferAtIndex(0)->requiredPreviousFrameIndex());
|
| + unsigned frameCount = decoder->frameCount();
|
| + for (size_t i = 1; i < frameCount; ++i)
|
| + EXPECT_EQ(i - 1, decoder->frameBufferAtIndex(i)->requiredPreviousFrameIndex());
|
| +
|
| + decoder->setData(fullData.get(), true);
|
| + for (size_t i = 0; i < frameCount; ++i)
|
| + EXPECT_EQ(notFound, decoder->frameBufferAtIndex(i)->requiredPreviousFrameIndex());
|
| +}
|
| +
|
| +void testRandomFrameDecode(const char* gifFile)
|
| +{
|
| + SCOPED_TRACE(gifFile);
|
| +
|
| + RefPtr<SharedBuffer> fullData = readFile(gifFile);
|
| + ASSERT_TRUE(fullData.get());
|
| + Vector<unsigned> baselineHashes;
|
| + createDecodingBaseline(fullData.get(), &baselineHashes);
|
| + size_t frameCount = baselineHashes.size();
|
| +
|
| + // Random decoding should get the same results as sequential decoding.
|
| + OwnPtr<GIFImageDecoder> 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) {
|
| + SCOPED_TRACE(testing::Message() << "Random i:" << i << " j:" << j);
|
| + ImageFrame* frame = decoder->frameBufferAtIndex(j);
|
| + EXPECT_EQ(baselineHashes[j], hashSkBitmap(frame->getSkBitmap()));
|
| + }
|
| + }
|
| +
|
| + // Decoding in reverse order.
|
| + decoder = createDecoder();
|
| + decoder->setData(fullData.get(), true);
|
| + for (size_t i = frameCount; i; --i) {
|
| + SCOPED_TRACE(testing::Message() << "Reverse i:" << i);
|
| + ImageFrame* frame = decoder->frameBufferAtIndex(i - 1);
|
| + EXPECT_EQ(baselineHashes[i - 1], hashSkBitmap(frame->getSkBitmap()));
|
| + }
|
| +}
|
| +
|
| +TEST(GIFImageDecoderTest, randomFrameDecode)
|
| +{
|
| + // Single frame image.
|
| + testRandomFrameDecode("/Source/WebKit/chromium/tests/data/radient.gif");
|
| + // Multiple frame image.
|
| + testRandomFrameDecode("/LayoutTests/fast/images/resources/animated-gif-with-offsets.gif");
|
| + testRandomFrameDecode("/LayoutTests/fast/images/resources/animated-10color.gif");
|
| +}
|
| +
|
| +void testRandomDecodeAfterClearFrameBufferCache(const char* gifFile)
|
| +{
|
| + SCOPED_TRACE(gifFile);
|
| +
|
| + RefPtr<SharedBuffer> data = readFile(gifFile);
|
| + ASSERT_TRUE(data.get());
|
| + Vector<unsigned> baselineHashes;
|
| + createDecodingBaseline(data.get(), &baselineHashes);
|
| + size_t frameCount = baselineHashes.size();
|
| +
|
| + OwnPtr<GIFImageDecoder> decoder(createDecoder());
|
| + 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) {
|
| + SCOPED_TRACE(testing::Message() << "Random i:" << i << " j:" << j);
|
| + ImageFrame* frame = decoder->frameBufferAtIndex(j);
|
| + EXPECT_EQ(baselineHashes[j], hashSkBitmap(frame->getSkBitmap()));
|
| + }
|
| + }
|
| + }
|
| +}
|
| +
|
| +TEST(GIFImageDecoderTest, randomDecodeAfterClearFrameBufferCache)
|
| +{
|
| + // Single frame image.
|
| + testRandomFrameDecode("/Source/WebKit/chromium/tests/data/radient.gif");
|
| + // Multiple frame image.
|
| + testRandomFrameDecode("/LayoutTests/fast/images/resources/animated-gif-with-offsets.gif");
|
| + testRandomFrameDecode("/LayoutTests/fast/images/resources/animated-10color.gif");
|
| +}
|
| +
|
| +TEST(GIFImageDecoderTest, resumePartialDecodeAfterClearFrameBufferCache)
|
| +{
|
| + RefPtr<SharedBuffer> fullData = readFile("/LayoutTests/fast/images/resources/animated-10color.gif");
|
| + ASSERT_TRUE(fullData.get());
|
| + Vector<unsigned> baselineHashes;
|
| + createDecodingBaseline(fullData.get(), &baselineHashes);
|
| + size_t frameCount = baselineHashes.size();
|
| +
|
| + OwnPtr<GIFImageDecoder> decoder(createDecoder());
|
| +
|
| + // Let frame 0 be partially decoded.
|
| + size_t partialSize = 1;
|
| + do {
|
| + RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), partialSize);
|
| + decoder->setData(data.get(), false);
|
| + ++partialSize;
|
| + } while (!decoder->frameCount() || decoder->frameBufferAtIndex(0)->status() == ImageFrame::FrameEmpty);
|
| +
|
| + // Skip to the last frame and clear.
|
| + decoder->setData(fullData.get(), true);
|
| + EXPECT_EQ(frameCount, decoder->frameCount());
|
| + ImageFrame* lastFrame = decoder->frameBufferAtIndex(frameCount - 1);
|
| + EXPECT_EQ(baselineHashes[frameCount - 1], hashSkBitmap(lastFrame->getSkBitmap()));
|
| + decoder->clearFrameBufferCache(notFound);
|
| +
|
| + // Resume decoding of the first frame.
|
| + ImageFrame* firstFrame = decoder->frameBufferAtIndex(0);
|
| + EXPECT_EQ(ImageFrame::FrameComplete, firstFrame->status());
|
| + EXPECT_EQ(baselineHashes[0], hashSkBitmap(firstFrame->getSkBitmap()));
|
| +}
|
| +
|
| #endif
|
|
|
| } // namespace
|
|
|