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 ea4acb278a050386e79e3c5a1a48017b193c7694..05372f30b44b93d168b47798cc76891ceace11ff 100644 |
--- a/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp |
+++ b/third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp |
@@ -59,16 +59,7 @@ void testRepetitionCount(const char* dir, |
RefPtr<SharedBuffer> data = readFile(dir, file); |
ASSERT_TRUE(data.get()); |
decoder->setData(data.get(), true); |
- EXPECT_EQ(cAnimationLoopOnce, |
- decoder->repetitionCount()); // Default value before decode. |
- |
- for (size_t i = 0; i < decoder->frameCount(); ++i) { |
- ImageFrame* frame = decoder->frameBufferAtIndex(i); |
- EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus()); |
- } |
- |
- EXPECT_EQ(expectedRepetitionCount, |
- decoder->repetitionCount()); // Expected value after decode. |
+ EXPECT_EQ(expectedRepetitionCount, decoder->repetitionCount()); |
} |
} // anonymous namespace |
@@ -79,7 +70,6 @@ TEST(GIFImageDecoderTest, decodeTwoFrames) { |
RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif"); |
ASSERT_TRUE(data.get()); |
decoder->setData(data.get(), true); |
- EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount()); |
ImageFrame* frame = decoder->frameBufferAtIndex(0); |
uint32_t generationID0 = frame->bitmap().getGenerationID(); |
@@ -104,10 +94,6 @@ TEST(GIFImageDecoderTest, parseAndDecode) { |
RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif"); |
ASSERT_TRUE(data.get()); |
decoder->setData(data.get(), true); |
- EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount()); |
- |
- // This call will parse the entire file. |
- EXPECT_EQ(2u, decoder->frameCount()); |
ImageFrame* frame = decoder->frameBufferAtIndex(0); |
EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus()); |
@@ -307,24 +293,6 @@ TEST(GIFImageDecoderTest, badCode) { |
EXPECT_TRUE(testDecoder->failed()); |
} |
-TEST(GIFImageDecoderTest, invalidDisposalMethod) { |
- std::unique_ptr<ImageDecoder> decoder = createDecoder(); |
- |
- // The image has 2 frames, with disposal method 4 and 5, respectively. |
- RefPtr<SharedBuffer> data = |
- readFile(decodersTestingDir, "invalid-disposal-method.gif"); |
- ASSERT_TRUE(data.get()); |
- decoder->setData(data.get(), true); |
- |
- EXPECT_EQ(2u, decoder->frameCount()); |
- // Disposal method 4 is converted to ImageFrame::DisposeOverwritePrevious. |
- EXPECT_EQ(ImageFrame::DisposeOverwritePrevious, |
- decoder->frameBufferAtIndex(0)->getDisposalMethod()); |
- // Disposal method 5 is ignored. |
- EXPECT_EQ(ImageFrame::DisposeNotSpecified, |
- decoder->frameBufferAtIndex(1)->getDisposalMethod()); |
-} |
- |
TEST(GIFImageDecoderTest, firstFrameHasGreaterSizeThanScreenSize) { |
RefPtr<SharedBuffer> fullData = readFile( |
decodersTestingDir, "first-frame-has-greater-size-than-screen-size.gif"); |