Move gif image decoder to SkCodec

third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 41 matching lines @@
                           ImageDecoder::noDecodedImageByteLimit));
 }
 
 void testRepetitionCount(const char* dir,
                          const char* file,
                          int expectedRepetitionCount) {
   std::unique_ptr<ImageDecoder> decoder = createDecoder();
   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());
-  }
+  // Decode a frame to verify the decoder had a chance to update its state
+  decoder->frameBufferAtIndex(0);

[cblume, 2017/03/28 08:35:00]

Previously, decode->repetitionCount() would end up getting the frame infos. From
there, it was able to return the correct value without requiring a frame be
decoded.

But the problem is it was fetching the frame infos vector more often. And since
repetitionCount() is a const member function, it couldn't update the stored
values.

Rather than have it fetch the frame infos vector again, I figured it made more
sense for the test to reflect what the image decoders do: allow the decoder to
update its state.

 
-  EXPECT_EQ(expectedRepetitionCount,
-            decoder->repetitionCount());  // Expected value after decode.
+  EXPECT_EQ(expectedRepetitionCount, decoder->repetitionCount());
 }
 
 }  // anonymous namespace
 
 TEST(GIFImageDecoderTest, decodeTwoFrames) {
   std::unique_ptr<ImageDecoder> decoder = createDecoder();
 
   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();
   EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());
   EXPECT_EQ(16, frame->bitmap().width());
   EXPECT_EQ(16, frame->bitmap().height());
 
   frame = decoder->frameBufferAtIndex(1);
   uint32_t generationID1 = frame->bitmap().getGenerationID();
   EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());
   EXPECT_EQ(16, frame->bitmap().width());
   EXPECT_EQ(16, frame->bitmap().height());
   EXPECT_TRUE(generationID0 != generationID1);
 
   EXPECT_EQ(2u, decoder->frameCount());
   EXPECT_EQ(cAnimationLoopInfinite, decoder->repetitionCount());
 }
 
 TEST(GIFImageDecoderTest, parseAndDecode) {
   std::unique_ptr<ImageDecoder> decoder = createDecoder();
 
   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());
   EXPECT_EQ(16, frame->bitmap().width());
   EXPECT_EQ(16, frame->bitmap().height());
 
   frame = decoder->frameBufferAtIndex(1);
   EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());
   EXPECT_EQ(16, frame->bitmap().width());
   EXPECT_EQ(16, frame->bitmap().height());
@@ skipping 179 matching lines @@
   RefPtr<SharedBuffer> testData = readFile(decodersTestingDir, "bad-code.gif");
   ASSERT_TRUE(testData.get());
 
   std::unique_ptr<ImageDecoder> testDecoder = createDecoder();
   testDecoder->setData(testData.get(), true);
   EXPECT_EQ(1u, testDecoder->frameCount());
   ASSERT_TRUE(testDecoder->frameBufferAtIndex(0));
   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");
   ASSERT_TRUE(fullData.get());
 
   std::unique_ptr<ImageDecoder> decoder;
   IntSize frameSize;
 
   // Compute hashes when the file is truncated.
   for (size_t i = 1; i <= fullData->size(); ++i) {
@@ skipping 14 matching lines @@
 
 TEST(GIFImageDecoderTest, verifyRepetitionCount) {
   testRepetitionCount(layoutTestResourcesDir, "full2loop.gif", 2);
   testRepetitionCount(decodersTestingDir, "radient.gif", cAnimationNone);
 }
 
 TEST(GIFImageDecoderTest, bitmapAlphaType) {
   RefPtr<SharedBuffer> fullData = readFile(decodersTestingDir, "radient.gif");
   ASSERT_TRUE(fullData.get());
 
-  // Empirically chosen truncation size:
-  //   a) large enough to produce a partial frame &&
-  //   b) small enough to not fully decode the frame
-  const size_t kTruncateSize = 800;
-  ASSERT_TRUE(kTruncateSize < fullData->size());
-  RefPtr<SharedBuffer> partialData =
-      SharedBuffer::create(fullData->data(), kTruncateSize);
-
   std::unique_ptr<ImageDecoder> premulDecoder = WTF::wrapUnique(
       new GIFImageDecoder(ImageDecoder::AlphaPremultiplied,
                           ColorBehavior::transformToTargetForTesting(),
                           ImageDecoder::noDecodedImageByteLimit));
   std::unique_ptr<ImageDecoder> unpremulDecoder = WTF::wrapUnique(
       new GIFImageDecoder(ImageDecoder::AlphaNotPremultiplied,
                           ColorBehavior::transformToTargetForTesting(),
                           ImageDecoder::noDecodedImageByteLimit));
 
-  // Partially decoded frame => the frame alpha type is unknown and should
-  // reflect the requested format.
-  premulDecoder->setData(partialData.get(), false);
-  ASSERT_TRUE(premulDecoder->frameCount());
-  unpremulDecoder->setData(partialData.get(), false);
-  ASSERT_TRUE(unpremulDecoder->frameCount());
-  ImageFrame* premulFrame = premulDecoder->frameBufferAtIndex(0);
-  EXPECT_TRUE(premulFrame &&
-              premulFrame->getStatus() != ImageFrame::FrameComplete);
-  EXPECT_EQ(premulFrame->bitmap().alphaType(), kPremul_SkAlphaType);
-  ImageFrame* unpremulFrame = unpremulDecoder->frameBufferAtIndex(0);
-  EXPECT_TRUE(unpremulFrame &&
-              unpremulFrame->getStatus() != ImageFrame::FrameComplete);
-  EXPECT_EQ(unpremulFrame->bitmap().alphaType(), kUnpremul_SkAlphaType);
-
-  // Fully decoded frame => the frame alpha type is known (opaque).
   premulDecoder->setData(fullData.get(), true);
   ASSERT_TRUE(premulDecoder->frameCount());
   unpremulDecoder->setData(fullData.get(), true);
   ASSERT_TRUE(unpremulDecoder->frameCount());
-  premulFrame = premulDecoder->frameBufferAtIndex(0);
+  ImageFrame* premulFrame = premulDecoder->frameBufferAtIndex(0);
   EXPECT_TRUE(premulFrame &&
               premulFrame->getStatus() == ImageFrame::FrameComplete);
-  EXPECT_EQ(premulFrame->bitmap().alphaType(), kOpaque_SkAlphaType);
-  unpremulFrame = unpremulDecoder->frameBufferAtIndex(0);
+  EXPECT_EQ(premulFrame->bitmap().alphaType(), kPremul_SkAlphaType);
+  ImageFrame* unpremulFrame = unpremulDecoder->frameBufferAtIndex(0);
   EXPECT_TRUE(unpremulFrame &&
               unpremulFrame->getStatus() == ImageFrame::FrameComplete);
-  EXPECT_EQ(unpremulFrame->bitmap().alphaType(), kOpaque_SkAlphaType);
+  EXPECT_EQ(unpremulFrame->bitmap().alphaType(), kUnpremul_SkAlphaType);
 }
 
 namespace {
 // Needed to exercise ImageDecoder::setMemoryAllocator, but still does the
 // default allocation.
 class Allocator final : public SkBitmap::Allocator {
   bool allocPixelRef(SkBitmap* dst, SkColorTable* ctable) override {
     return dst->tryAllocPixels(ctable);
   }
 };
@@ skipping 13 matching lines @@
   EXPECT_EQ(1u, decoder->frameCount());
   ImageFrame* frame = decoder->frameBufferAtIndex(0);
   decoder->setMemoryAllocator(nullptr);
 
   ASSERT_TRUE(frame);
   EXPECT_EQ(IntRect(IntPoint(), decoder->size()), frame->originalFrameRect());
   EXPECT_FALSE(frame->hasAlpha());
 }
 
 }  // namespace blink