| Index: third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp
|
| index b7a206a1b9e97a445235c2f6904c01c5a8e3feb8..6695f0dc90159be58f913c63afa62b11ef1b09d2 100644
|
| --- a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp
|
| @@ -48,19 +48,55 @@ const char decodersTestingDir[] = "Source/platform/image-decoders/testing";
|
| const char layoutTestResourcesDir[] = "LayoutTests/fast/images/resources";
|
| const char webTestsDataDir[] = "Source/web/tests/data";
|
|
|
| -PassOwnPtr<ImageDecoder> createDecoder()
|
| +#define LOOP_DECODERS_BEGIN \
|
| + DecoderCreator decoderCreators[2] = { &createDecoderN32, &createDecoderIndex8 }; \
|
| + for (DecoderCreator createDecoder : decoderCreators) {
|
| +
|
| +#define LOOP_DECODERS_END \
|
| + }
|
| +
|
| +PassOwnPtr<ImageDecoder> createDecoderN32()
|
| +{
|
| + return adoptPtr(new GIFImageDecoder(ImageDecoder::AlphaNotPremultiplied, ImageDecoder::GammaAndColorProfileApplied, ImageDecoder::noDecodedImageByteLimit, ImageFrame::N32));
|
| +}
|
| +
|
| +PassOwnPtr<ImageDecoder> createDecoderIndex8()
|
| {
|
| - return adoptPtr(new GIFImageDecoder(ImageDecoder::AlphaNotPremultiplied, ImageDecoder::GammaAndColorProfileApplied, ImageDecoder::noDecodedImageByteLimit));
|
| + return adoptPtr(new GIFImageDecoder(ImageDecoder::AlphaNotPremultiplied, ImageDecoder::GammaAndColorProfileApplied, ImageDecoder::noDecodedImageByteLimit, ImageFrame::Index8));
|
| +}
|
| +
|
| +static bool areFramesColorsEqual(ImageFrame* b1, ImageFrame* b2)
|
| +{
|
| + // The same premultiply alpha should be set.
|
| + if (b1->premultiplyAlpha() != b2->premultiplyAlpha())
|
| + return false;
|
| + if (b1->getSkBitmap().width() != b2->getSkBitmap().width()
|
| + || b1->getSkBitmap().height() != b2->getSkBitmap().height())
|
| + return false;
|
| +
|
| + int width = b1->getSkBitmap().width();
|
| + int height = b1->getSkBitmap().height();
|
| + for (int j = 0; j < height; ++j) {
|
| + for (int i = 0; i < width; ++i) {
|
| + uint32_t c1 = b1->getSkBitmap().getColor(i, j);
|
| + uint32_t c2 = b2->getSkBitmap().getColor(i, j);
|
| + if (c1 != c2) {
|
| + return false;
|
| + }
|
| + }
|
| + }
|
| + return true;
|
| }
|
|
|
| void testRandomFrameDecode(const char* dir, const char* gifFile)
|
| {
|
| + LOOP_DECODERS_BEGIN
|
| SCOPED_TRACE(gifFile);
|
|
|
| RefPtr<SharedBuffer> fullData = readFile(dir, gifFile);
|
| ASSERT_TRUE(fullData.get());
|
| Vector<unsigned> baselineHashes;
|
| - createDecodingBaseline(&createDecoder, fullData.get(), &baselineHashes);
|
| + createDecodingBaseline(createDecoder, fullData.get(), &baselineHashes);
|
| size_t frameCount = baselineHashes.size();
|
|
|
| // Random decoding should get the same results as sequential decoding.
|
| @@ -83,19 +119,25 @@ void testRandomFrameDecode(const char* dir, const char* gifFile)
|
| ImageFrame* frame = decoder->frameBufferAtIndex(i - 1);
|
| EXPECT_EQ(baselineHashes[i - 1], hashBitmap(frame->getSkBitmap()));
|
| }
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| -void testRandomDecodeAfterClearFrameBufferCache(const char* dir, const char* gifFile)
|
| +void testRandomDecodeAfterClearFrameBufferCache(const char* dir, const char* gifFile, ImageFrame::ColorType targetType = ImageFrame::N32)
|
| {
|
| SCOPED_TRACE(gifFile);
|
|
|
| RefPtr<SharedBuffer> data = readFile(dir, gifFile);
|
| ASSERT_TRUE(data.get());
|
| Vector<unsigned> baselineHashes;
|
| - createDecodingBaseline(&createDecoder, data.get(), &baselineHashes);
|
| + DecoderCreator decoderCreator = &createDecoderIndex8;
|
| + if (targetType == ImageFrame::N32) {
|
| + decoderCreator = &createDecoderN32;
|
| + }
|
| + createDecodingBaseline(decoderCreator, data.get(), &baselineHashes);
|
| +
|
| size_t frameCount = baselineHashes.size();
|
|
|
| - OwnPtr<ImageDecoder> decoder = createDecoder();
|
| + OwnPtr<ImageDecoder> decoder = decoderCreator();
|
| decoder->setData(data.get(), true);
|
| for (size_t clearExceptFrame = 0; clearExceptFrame < frameCount; ++clearExceptFrame) {
|
| decoder->clearCacheExceptFrame(clearExceptFrame);
|
| @@ -103,8 +145,84 @@ void testRandomDecodeAfterClearFrameBufferCache(const char* dir, const char* gif
|
| 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);
|
| + bool canDecodeToIndex8 = decoder->canDecodeTo(j, ImageFrame::Index8);
|
| + ImageFrame* frame = decoder->frameBufferAtIndex(j);
|
| + EXPECT_EQ(baselineHashes[j], hashBitmap(frame->getSkBitmap()));
|
| + EXPECT_EQ(canDecodeToIndex8, frame->getSkBitmap().colorType() == kIndex_8_SkColorType);
|
| + }
|
| + }
|
| + }
|
| +}
|
| +
|
| +void testRandomFrameDecodeCompare(const char* dir, const char* gifFile)
|
| +{
|
| + SCOPED_TRACE(gifFile);
|
| +
|
| + RefPtr<SharedBuffer> fullData = readFile(dir, gifFile);
|
| + ASSERT_TRUE(fullData.get());
|
| + Vector<unsigned> baselineHashes;
|
| + createDecodingBaseline(&createDecoderN32, fullData.get(), &baselineHashes);
|
| + size_t frameCount = baselineHashes.size();
|
| +
|
| + // Random decoding should get the same results as sequential decoding.
|
| + OwnPtr<ImageDecoder> decoder = createDecoderN32();
|
| + // Test Index8 and RGBA through the same scenario.
|
| + OwnPtr<ImageDecoder> decoderI8 = createDecoderIndex8();
|
| +
|
| + decoder->setData(fullData.get(), true);
|
| + decoderI8->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], hashBitmap(frame->getSkBitmap()));
|
| + ImageFrame* frameI8 = decoderI8->frameBufferAtIndex(j);
|
| + ASSERT_TRUE(areFramesColorsEqual(frame, frameI8));
|
| + }
|
| + }
|
| +
|
| + // Decoding in reverse order.
|
| + decoder = createDecoderN32();
|
| + decoderI8 = createDecoderIndex8();
|
| + decoder->setData(fullData.get(), true);
|
| + decoderI8->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], hashBitmap(frame->getSkBitmap()));
|
| + ImageFrame* frameI8 = decoderI8->frameBufferAtIndex(i - 1);
|
| + ASSERT_TRUE(areFramesColorsEqual(frame, frameI8));
|
| + }
|
| +}
|
| +
|
| +void testRandomDecodeAfterClearFrameBufferCacheCompare(const char* dir, const char* gifFile)
|
| +{
|
| + SCOPED_TRACE(gifFile);
|
| +
|
| + RefPtr<SharedBuffer> data = readFile(dir, gifFile);
|
| + ASSERT_TRUE(data.get());
|
| + Vector<unsigned> baselineHashes;
|
| + createDecodingBaseline(&createDecoderN32, data.get(), &baselineHashes);
|
| + size_t frameCount = baselineHashes.size();
|
| +
|
| + OwnPtr<ImageDecoder> decoder = createDecoderN32();
|
| + // Test Index8 and RGBA through the same scenario and compare pixels.
|
| + OwnPtr<ImageDecoder> decoderI8 = createDecoderIndex8();
|
| +
|
| + decoder->setData(data.get(), true);
|
| + decoderI8->setData(data.get(), true);
|
| + for (size_t clearExceptFrame = 0; clearExceptFrame < frameCount; ++clearExceptFrame) {
|
| + decoder->clearCacheExceptFrame(clearExceptFrame);
|
| + decoderI8->clearCacheExceptFrame(clearExceptFrame);
|
| + const size_t skippingStep = 5;
|
| + for (size_t i = 0; i < skippingStep; ++i) {
|
| + for (size_t j = 0; j < frameCount; j += (i + 2)) {
|
| + SCOPED_TRACE(testing::Message() << "Random i:" << i << " j:" << j);
|
| ImageFrame* frame = decoder->frameBufferAtIndex(j);
|
| EXPECT_EQ(baselineHashes[j], hashBitmap(frame->getSkBitmap()));
|
| + ImageFrame* frameI8 = decoderI8->frameBufferAtIndex(j);
|
| + ASSERT_TRUE(areFramesColorsEqual(frame, frameI8));
|
| }
|
| }
|
| }
|
| @@ -114,11 +232,13 @@ void testRandomDecodeAfterClearFrameBufferCache(const char* dir, const char* gif
|
|
|
| TEST(GIFImageDecoderTest, decodeTwoFrames)
|
| {
|
| - OwnPtr<ImageDecoder> decoder = createDecoder();
|
| + OwnPtr<ImageDecoder> decoder = createDecoderN32();
|
| + OwnPtr<ImageDecoder> decoderI8 = createDecoderIndex8();
|
|
|
| RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
|
| ASSERT_TRUE(data.get());
|
| decoder->setData(data.get(), true);
|
| + decoderI8->setData(data.get(), true);
|
| EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount());
|
|
|
| ImageFrame* frame = decoder->frameBufferAtIndex(0);
|
| @@ -127,6 +247,14 @@ TEST(GIFImageDecoderTest, decodeTwoFrames)
|
| EXPECT_EQ(16, frame->getSkBitmap().width());
|
| EXPECT_EQ(16, frame->getSkBitmap().height());
|
|
|
| + ImageFrame* frameI8 = decoderI8->frameBufferAtIndex(0);
|
| + generationID0 = frameI8->getSkBitmap().getGenerationID();
|
| + EXPECT_EQ(ImageFrame::FrameComplete, frameI8->status());
|
| + EXPECT_EQ(16, frameI8->getSkBitmap().width());
|
| + EXPECT_EQ(16, frameI8->getSkBitmap().height());
|
| +
|
| + ASSERT_TRUE(areFramesColorsEqual(frame, frameI8));
|
| +
|
| frame = decoder->frameBufferAtIndex(1);
|
| uint32_t generationID1 = frame->getSkBitmap().getGenerationID();
|
| EXPECT_EQ(ImageFrame::FrameComplete, frame->status());
|
| @@ -136,10 +264,16 @@ TEST(GIFImageDecoderTest, decodeTwoFrames)
|
|
|
| EXPECT_EQ(2u, decoder->frameCount());
|
| EXPECT_EQ(cAnimationLoopInfinite, decoder->repetitionCount());
|
| +
|
| + frameI8 = decoderI8->frameBufferAtIndex(1);
|
| + ASSERT_TRUE(areFramesColorsEqual(frame, frameI8));
|
| + EXPECT_EQ(2u, decoderI8->frameCount());
|
| + EXPECT_EQ(cAnimationLoopInfinite, decoderI8->repetitionCount());
|
| }
|
|
|
| TEST(GIFImageDecoderTest, parseAndDecode)
|
| {
|
| + LOOP_DECODERS_BEGIN
|
| OwnPtr<ImageDecoder> decoder = createDecoder();
|
|
|
| RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
|
| @@ -160,11 +294,13 @@ TEST(GIFImageDecoderTest, parseAndDecode)
|
| EXPECT_EQ(16, frame->getSkBitmap().width());
|
| EXPECT_EQ(16, frame->getSkBitmap().height());
|
| EXPECT_EQ(cAnimationLoopInfinite, decoder->repetitionCount());
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| TEST(GIFImageDecoderTest, parseByteByByte)
|
| {
|
| - OwnPtr<ImageDecoder> decoder = createDecoder();
|
| + OwnPtr<ImageDecoder> decoder = createDecoderN32();
|
| + OwnPtr<ImageDecoder> decoderI8 = createDecoderIndex8();
|
|
|
| RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
|
| ASSERT_TRUE(data.get());
|
| @@ -175,8 +311,11 @@ TEST(GIFImageDecoderTest, parseByteByByte)
|
| for (size_t length = 1; length <= data->size(); ++length) {
|
| RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), length);
|
| decoder->setData(tempData.get(), length == data->size());
|
| + decoderI8->setData(tempData.get(), length == data->size());
|
|
|
| EXPECT_LE(frameCount, decoder->frameCount());
|
| + EXPECT_LE(frameCount, decoderI8->frameCount());
|
| + EXPECT_EQ(decoder->frameCount(), decoderI8->frameCount());
|
| frameCount = decoder->frameCount();
|
| }
|
|
|
| @@ -189,7 +328,8 @@ TEST(GIFImageDecoderTest, parseByteByByte)
|
|
|
| TEST(GIFImageDecoderTest, parseAndDecodeByteByByte)
|
| {
|
| - OwnPtr<ImageDecoder> decoder = createDecoder();
|
| + OwnPtr<ImageDecoder> decoder = createDecoderN32();
|
| + OwnPtr<ImageDecoder> decoderI8 = createDecoderIndex8();
|
|
|
| RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated-gif-with-offsets.gif");
|
| ASSERT_TRUE(data.get());
|
| @@ -201,13 +341,18 @@ TEST(GIFImageDecoderTest, parseAndDecodeByteByByte)
|
| for (size_t length = 1; length <= data->size(); ++length) {
|
| RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), length);
|
| decoder->setData(tempData.get(), length == data->size());
|
| + decoderI8->setData(tempData.get(), length == data->size());
|
|
|
| EXPECT_LE(frameCount, decoder->frameCount());
|
| frameCount = decoder->frameCount();
|
| + EXPECT_EQ(frameCount, decoderI8->frameCount());
|
|
|
| ImageFrame* frame = decoder->frameBufferAtIndex(frameCount - 1);
|
| if (frame && frame->status() == ImageFrame::FrameComplete && framesDecoded < frameCount)
|
| ++framesDecoded;
|
| +
|
| + ImageFrame* frameI8 = decoderI8->frameBufferAtIndex(frameCount - 1);
|
| + ASSERT_TRUE(!(frame || frameI8) || areFramesColorsEqual(frame, frameI8));
|
| }
|
|
|
| EXPECT_EQ(5u, decoder->frameCount());
|
| @@ -217,6 +362,7 @@ TEST(GIFImageDecoderTest, parseAndDecodeByteByByte)
|
|
|
| TEST(GIFImageDecoderTest, brokenSecondFrame)
|
| {
|
| + LOOP_DECODERS_BEGIN
|
| OwnPtr<ImageDecoder> decoder = createDecoder();
|
|
|
| RefPtr<SharedBuffer> data = readFile(webTestsDataDir, "broken.gif");
|
| @@ -227,10 +373,12 @@ TEST(GIFImageDecoderTest, brokenSecondFrame)
|
| EXPECT_EQ(1u, decoder->frameCount());
|
| ImageFrame* frame = decoder->frameBufferAtIndex(1);
|
| EXPECT_FALSE(frame);
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| TEST(GIFImageDecoderTest, progressiveDecode)
|
| {
|
| + LOOP_DECODERS_BEGIN
|
| RefPtr<SharedBuffer> fullData = readFile(webTestsDataDir, "radient.gif");
|
| ASSERT_TRUE(fullData.get());
|
| const size_t fullLength = fullData->size();
|
| @@ -278,10 +426,12 @@ TEST(GIFImageDecoderTest, progressiveDecode)
|
| }
|
| }
|
| EXPECT_TRUE(match);
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| TEST(GIFImageDecoderTest, allDataReceivedTruncation)
|
| {
|
| + LOOP_DECODERS_BEGIN
|
| OwnPtr<ImageDecoder> decoder = createDecoder();
|
|
|
| RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
|
| @@ -298,10 +448,12 @@ TEST(GIFImageDecoderTest, allDataReceivedTruncation)
|
| EXPECT_FALSE(decoder->failed());
|
| decoder->frameBufferAtIndex(1);
|
| EXPECT_TRUE(decoder->failed());
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| TEST(GIFImageDecoderTest, frameIsComplete)
|
| {
|
| + LOOP_DECODERS_BEGIN
|
| OwnPtr<ImageDecoder> decoder = createDecoder();
|
|
|
| RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
|
| @@ -313,10 +465,12 @@ TEST(GIFImageDecoderTest, frameIsComplete)
|
| EXPECT_TRUE(decoder->frameIsCompleteAtIndex(0));
|
| EXPECT_TRUE(decoder->frameIsCompleteAtIndex(1));
|
| EXPECT_EQ(cAnimationLoopInfinite, decoder->repetitionCount());
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| TEST(GIFImageDecoderTest, frameIsCompleteLoading)
|
| {
|
| + LOOP_DECODERS_BEGIN
|
| OwnPtr<ImageDecoder> decoder = createDecoder();
|
|
|
| RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
|
| @@ -335,10 +489,12 @@ TEST(GIFImageDecoderTest, frameIsCompleteLoading)
|
| EXPECT_EQ(2u, decoder->frameCount());
|
| EXPECT_TRUE(decoder->frameIsCompleteAtIndex(0));
|
| EXPECT_TRUE(decoder->frameIsCompleteAtIndex(1));
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| TEST(GIFImageDecoderTest, badTerminator)
|
| {
|
| + LOOP_DECODERS_BEGIN
|
| RefPtr<SharedBuffer> referenceData = readFile(webTestsDataDir, "radient.gif");
|
| RefPtr<SharedBuffer> testData = readFile(webTestsDataDir, "radient-bad-terminator.gif");
|
| ASSERT_TRUE(referenceData.get());
|
| @@ -357,10 +513,12 @@ TEST(GIFImageDecoderTest, badTerminator)
|
| ASSERT(testFrame);
|
|
|
| EXPECT_EQ(hashBitmap(referenceFrame->getSkBitmap()), hashBitmap(testFrame->getSkBitmap()));
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| TEST(GIFImageDecoderTest, updateRequiredPreviousFrameAfterFirstDecode)
|
| {
|
| + LOOP_DECODERS_BEGIN
|
| OwnPtr<ImageDecoder> decoder = createDecoder();
|
|
|
| RefPtr<SharedBuffer> fullData = readFile(layoutTestResourcesDir, "animated-10color.gif");
|
| @@ -383,6 +541,7 @@ TEST(GIFImageDecoderTest, updateRequiredPreviousFrameAfterFirstDecode)
|
| decoder->setData(fullData.get(), true);
|
| for (size_t i = 0; i < frameCount; ++i)
|
| EXPECT_EQ(kNotFound, decoder->frameBufferAtIndex(i)->requiredPreviousFrameIndex());
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| TEST(GIFImageDecoderTest, randomFrameDecode)
|
| @@ -394,6 +553,15 @@ TEST(GIFImageDecoderTest, randomFrameDecode)
|
| testRandomFrameDecode(layoutTestResourcesDir, "animated-10color.gif");
|
| }
|
|
|
| +TEST(GIFImageDecoderTest, randomFrameDecodeCompare)
|
| +{
|
| + // Single frame image.
|
| + testRandomFrameDecodeCompare(webTestsDataDir, "radient.gif");
|
| + // Multiple frame images.
|
| + testRandomFrameDecodeCompare(layoutTestResourcesDir, "animated-gif-with-offsets.gif");
|
| + testRandomFrameDecodeCompare(layoutTestResourcesDir, "animated-10color.gif");
|
| +}
|
| +
|
| TEST(GIFImageDecoderTest, randomDecodeAfterClearFrameBufferCache)
|
| {
|
| // Single frame image.
|
| @@ -403,12 +571,23 @@ TEST(GIFImageDecoderTest, randomDecodeAfterClearFrameBufferCache)
|
| testRandomDecodeAfterClearFrameBufferCache(layoutTestResourcesDir, "animated-10color.gif");
|
| }
|
|
|
| +TEST(GIFImageDecoderTest, randomDecodeAfterClearFrameBufferCacheCompare)
|
| +{
|
| + // Single frame image.
|
| + testRandomDecodeAfterClearFrameBufferCacheCompare(webTestsDataDir, "radient.gif");
|
| + // Multiple frame images with offset. All frames depend to frame 0.
|
| + testRandomDecodeAfterClearFrameBufferCacheCompare(layoutTestResourcesDir, "animated-gif-with-offsets.gif");
|
| + testRandomDecodeAfterClearFrameBufferCacheCompare(layoutTestResourcesDir, "animated-10color.gif");
|
| +}
|
| +
|
| TEST(GIFImageDecoderTest, resumePartialDecodeAfterClearFrameBufferCache)
|
| {
|
| RefPtr<SharedBuffer> fullData = readFile(layoutTestResourcesDir, "animated-10color.gif");
|
| ASSERT_TRUE(fullData.get());
|
| +
|
| + LOOP_DECODERS_BEGIN
|
| Vector<unsigned> baselineHashes;
|
| - createDecodingBaseline(&createDecoder, fullData.get(), &baselineHashes);
|
| + createDecodingBaseline(createDecoder, fullData.get(), &baselineHashes);
|
| size_t frameCount = baselineHashes.size();
|
|
|
| OwnPtr<ImageDecoder> decoder = createDecoder();
|
| @@ -432,6 +611,7 @@ TEST(GIFImageDecoderTest, resumePartialDecodeAfterClearFrameBufferCache)
|
| ImageFrame* firstFrame = decoder->frameBufferAtIndex(0);
|
| EXPECT_EQ(ImageFrame::FrameComplete, firstFrame->status());
|
| EXPECT_EQ(baselineHashes[0], hashBitmap(firstFrame->getSkBitmap()));
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| // The first LZW codes in the image are invalid values that try to create a loop
|
| @@ -441,11 +621,13 @@ TEST(GIFImageDecoderTest, badInitialCode)
|
| RefPtr<SharedBuffer> testData = readFile(decodersTestingDir, "bad-initial-code.gif");
|
| ASSERT_TRUE(testData.get());
|
|
|
| + LOOP_DECODERS_BEGIN
|
| OwnPtr<ImageDecoder> testDecoder = createDecoder();
|
| testDecoder->setData(testData.get(), true);
|
| EXPECT_EQ(1u, testDecoder->frameCount());
|
| ASSERT_TRUE(testDecoder->frameBufferAtIndex(0));
|
| EXPECT_TRUE(testDecoder->failed());
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| // The image has an invalid LZW code that exceeds dictionary size. Decoding should fail.
|
| @@ -454,15 +636,18 @@ TEST(GIFImageDecoderTest, badCode)
|
| RefPtr<SharedBuffer> testData = readFile(decodersTestingDir, "bad-code.gif");
|
| ASSERT_TRUE(testData.get());
|
|
|
| + LOOP_DECODERS_BEGIN
|
| OwnPtr<ImageDecoder> testDecoder = createDecoder();
|
| testDecoder->setData(testData.get(), true);
|
| EXPECT_EQ(1u, testDecoder->frameCount());
|
| ASSERT_TRUE(testDecoder->frameBufferAtIndex(0));
|
| EXPECT_TRUE(testDecoder->failed());
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| TEST(GIFImageDecoderTest, invalidDisposalMethod)
|
| {
|
| + LOOP_DECODERS_BEGIN
|
| OwnPtr<ImageDecoder> decoder = createDecoder();
|
|
|
| // The image has 2 frames, with disposal method 4 and 5, respectively.
|
| @@ -475,13 +660,14 @@ TEST(GIFImageDecoderTest, invalidDisposalMethod)
|
| EXPECT_EQ(ImageFrame::DisposeOverwritePrevious, decoder->frameBufferAtIndex(0)->disposalMethod());
|
| // Disposal method 5 is ignored.
|
| EXPECT_EQ(ImageFrame::DisposeNotSpecified, decoder->frameBufferAtIndex(1)->disposalMethod());
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| TEST(GIFImageDecoderTest, firstFrameHasGreaterSizeThanScreenSize)
|
| {
|
| RefPtr<SharedBuffer> fullData = readFile(decodersTestingDir, "first-frame-has-greater-size-than-screen-size.gif");
|
| ASSERT_TRUE(fullData.get());
|
| -
|
| + LOOP_DECODERS_BEGIN
|
| OwnPtr<ImageDecoder> decoder;
|
| IntSize frameSize;
|
|
|
| @@ -499,6 +685,33 @@ TEST(GIFImageDecoderTest, firstFrameHasGreaterSizeThanScreenSize)
|
| ASSERT_EQ(frameSize.width(), decoder->decodedSize().width());
|
| ASSERT_EQ(frameSize.height(), decoder->decodedSize().height());
|
| }
|
| + LOOP_DECODERS_END
|
| }
|
|
|
| +// FIXME following benchmarks need to be removed before submitting.
|
| +#define BENCHMARK_DECODE(dir, file, title, count)\
|
| +TEST(GIFImageDecoderTest, tempBench_decodeIndex8##title##warmuprun)\
|
| +{\
|
| + testRandomDecodeAfterClearFrameBufferCache(dir, file);\
|
| +}\
|
| +TEST(GIFImageDecoderTest, tempBench_decodeN32##title##_x##count) \
|
| +{\
|
| + for (int i = 0; i < count; ++i)\
|
| + testRandomDecodeAfterClearFrameBufferCache(dir, file);\
|
| +}\
|
| +\
|
| +TEST(GIFImageDecoderTest, tempBench_decodeIndex8##title##_x##count)\
|
| +{\
|
| + for (int i = 0; i < count; ++i)\
|
| + testRandomDecodeAfterClearFrameBufferCache(dir, file, ImageFrame::Index8);\
|
| +}\
|
| +
|
| +BENCHMARK_DECODE(layoutTestResourcesDir, "animated-10color.gif", animated_10color_gif, 5)
|
| +BENCHMARK_DECODE(webTestsDataDir, "radient.gif", radient_gif, 10)
|
| +BENCHMARK_DECODE(layoutTestResourcesDir, "animated-gif-with-offsets.gif", animated_gif_with_offsets_gif, 5)
|
| +BENCHMARK_DECODE(layoutTestResourcesDir, "animated.gif", animated_gif, 10)
|
| +BENCHMARK_DECODE(layoutTestResourcesDir, "quicksort.gif", quicksort_gif, 5)
|
| +BENCHMARK_DECODE(layoutTestResourcesDir, "large-gif-checkerboard.gif", large_gif_checkerboard_gif, 5)
|
| +BENCHMARK_DECODE(layoutTestResourcesDir, "3dolph.gif", 3dolph_gif, 5)
|
| +// BENCHMARK_DECODE(layoutTestResourcesDir, "disneypixar-disney-pixar-jTXvL4LjakYI8.gif", disneypixar_disney_pixar_jTXvL4LjakYI8_gif, 1)
|
| } // namespace blink
|
|
|