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 05e56e9fe808901aacc44a3de7a9595af4e884da..2afcaf1c1c14c1dcd91cc6e9674497422efbd3d3 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,8 @@ void TestRepetitionCount(const char* dir, |
RefPtr<SharedBuffer> data = ReadFile(dir, file); |
ASSERT_TRUE(data.Get()); |
decoder->SetData(data.Get(), true); |
- EXPECT_EQ(kAnimationLoopOnce, |
- decoder->RepetitionCount()); // Default value before decode. |
- for (size_t i = 0; i < decoder->FrameCount(); ++i) { |
- ImageFrame* frame = decoder->FrameBufferAtIndex(i); |
- EXPECT_EQ(ImageFrame::kFrameComplete, frame->GetStatus()); |
- } |
- |
- EXPECT_EQ(expected_repetition_count, |
- decoder->RepetitionCount()); // Expected value after decode. |
+ EXPECT_EQ(expected_repetition_count, decoder->RepetitionCount()); |
} |
} // anonymous namespace |
@@ -79,7 +71,6 @@ TEST(GIFImageDecoderTest, decodeTwoFrames) { |
RefPtr<SharedBuffer> data = ReadFile(kLayoutTestResourcesDir, "animated.gif"); |
ASSERT_TRUE(data.Get()); |
decoder->SetData(data.Get(), true); |
- EXPECT_EQ(kAnimationLoopOnce, decoder->RepetitionCount()); |
ImageFrame* frame = decoder->FrameBufferAtIndex(0); |
uint32_t generation_id0 = frame->Bitmap().getGenerationID(); |
@@ -104,10 +95,6 @@ TEST(GIFImageDecoderTest, parseAndDecode) { |
RefPtr<SharedBuffer> data = ReadFile(kLayoutTestResourcesDir, "animated.gif"); |
ASSERT_TRUE(data.Get()); |
decoder->SetData(data.Get(), true); |
- EXPECT_EQ(kAnimationLoopOnce, decoder->RepetitionCount()); |
- |
- // This call will parse the entire file. |
- EXPECT_EQ(2u, decoder->FrameCount()); |
ImageFrame* frame = decoder->FrameBufferAtIndex(0); |
EXPECT_EQ(ImageFrame::kFrameComplete, frame->GetStatus()); |
@@ -310,24 +297,6 @@ TEST(GIFImageDecoderTest, badCode) { |
EXPECT_TRUE(test_decoder->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(kDecodersTestingDir, "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::kDisposeOverwritePrevious, |
- decoder->FrameBufferAtIndex(0)->GetDisposalMethod()); |
- // Disposal method 5 is ignored. |
- EXPECT_EQ(ImageFrame::kDisposeNotSpecified, |
- decoder->FrameBufferAtIndex(1)->GetDisposalMethod()); |
-} |
- |
TEST(GIFImageDecoderTest, firstFrameHasGreaterSizeThanScreenSize) { |
const Vector<char> full_data = |
ReadFile(kDecodersTestingDir, |
@@ -391,11 +360,11 @@ TEST(GIFImageDecoderTest, bitmapAlphaType) { |
ImageFrame* premul_frame = premul_decoder->FrameBufferAtIndex(0); |
EXPECT_TRUE(premul_frame && |
premul_frame->GetStatus() != ImageFrame::kFrameComplete); |
- EXPECT_EQ(premul_frame->Bitmap().alphaType(), kPremul_SkAlphaType); |
+ EXPECT_EQ(kPremul_SkAlphaType, premul_frame->Bitmap().alphaType()); |
ImageFrame* unpremul_frame = unpremul_decoder->FrameBufferAtIndex(0); |
EXPECT_TRUE(unpremul_frame && |
unpremul_frame->GetStatus() != ImageFrame::kFrameComplete); |
- EXPECT_EQ(unpremul_frame->Bitmap().alphaType(), kUnpremul_SkAlphaType); |
+ EXPECT_EQ(kUnpremul_SkAlphaType, unpremul_frame->Bitmap().alphaType()); |
// Fully decoded frame => the frame alpha type is known (opaque). |
premul_decoder->SetData(full_data_buffer.Get(), true); |
@@ -405,11 +374,11 @@ TEST(GIFImageDecoderTest, bitmapAlphaType) { |
premul_frame = premul_decoder->FrameBufferAtIndex(0); |
EXPECT_TRUE(premul_frame && |
premul_frame->GetStatus() == ImageFrame::kFrameComplete); |
- EXPECT_EQ(premul_frame->Bitmap().alphaType(), kOpaque_SkAlphaType); |
+ EXPECT_EQ(kOpaque_SkAlphaType, premul_frame->Bitmap().alphaType()); |
unpremul_frame = unpremul_decoder->FrameBufferAtIndex(0); |
EXPECT_TRUE(unpremul_frame && |
unpremul_frame->GetStatus() == ImageFrame::kFrameComplete); |
- EXPECT_EQ(unpremul_frame->Bitmap().alphaType(), kOpaque_SkAlphaType); |
+ EXPECT_EQ(kOpaque_SkAlphaType, unpremul_frame->Bitmap().alphaType()); |
} |
namespace { |