Reland change to enable deferred image decoding for animated GIFs

Source/core/platform/graphics/chromium/ImageFrameGeneratorTest.cpp

 /*
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 77 matching lines @@
     virtual void frameBufferRequested()
     {
         ++m_frameBufferRequestCount;
     }
 
     virtual ImageFrame::FrameStatus frameStatus()
     {
         return m_frameStatus;
     }
 
+    virtual size_t frameCount() { return 1; }
+    virtual int repetitionCount() const { return cAnimationNone; }
+    virtual float frameDuration() const { return 0; }
+
 protected:
     PassOwnPtr<ScaledImageFragment> createCompleteImage(const SkISize& size)
     {
         SkBitmap bitmap;
         bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height());
         bitmap.allocPixels();
         return ScaledImageFragment::createComplete(size, 0, bitmap);
     }
 
     void addNewData()
@@ skipping 22 matching lines @@
 TEST_F(ImageFrameGeneratorTest, cacheHit)
 {
     const ScaledImageFragment* fullImage = ImageDecodingStore::instance()->insertAndLockCache(
         m_generator.get(), createCompleteImage(fullSize()));
     EXPECT_EQ(fullSize(), fullImage->scaledSize());
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), fullImage);
 
     const ScaledImageFragment* tempImage = m_generator->decodeAndScale(fullSize());
     EXPECT_EQ(fullImage, tempImage);
     EXPECT_EQ(fullSize(), tempImage->scaledSize());
-    EXPECT_TRUE(m_generator->hasAlpha());
+    EXPECT_TRUE(m_generator->hasAlpha(0));
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
     EXPECT_EQ(0, m_frameBufferRequestCount);
 }
 
 TEST_F(ImageFrameGeneratorTest, cacheMissWithScale)
 {
     const ScaledImageFragment* fullImage = ImageDecodingStore::instance()->insertAndLockCache(
         m_generator.get(), createCompleteImage(fullSize()));
     EXPECT_EQ(fullSize(), fullImage->scaledSize());
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), fullImage);
 
     // Cache miss because of scaled size not found.
     const ScaledImageFragment* scaledImage = m_generator->decodeAndScale(scaledSize());
     EXPECT_NE(fullImage, scaledImage);
     EXPECT_EQ(scaledSize(), scaledImage->scaledSize());
-    EXPECT_TRUE(m_generator->hasAlpha());
+    EXPECT_TRUE(m_generator->hasAlpha(0));
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), scaledImage);
 
     // Cache hit.
     const ScaledImageFragment* tempImage = m_generator->decodeAndScale(scaledSize());
     EXPECT_EQ(scaledImage, tempImage);
     EXPECT_EQ(scaledSize(), tempImage->scaledSize());
-    EXPECT_TRUE(m_generator->hasAlpha());
+    EXPECT_TRUE(m_generator->hasAlpha(0));
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
     EXPECT_EQ(0, m_frameBufferRequestCount);
 }
 
 TEST_F(ImageFrameGeneratorTest, cacheMissWithDecodeAndScale)
 {
     setFrameStatus(ImageFrame::FrameComplete);
 
     // Cache miss.
     const ScaledImageFragment* scaledImage = m_generator->decodeAndScale(scaledSize());
     EXPECT_EQ(1, m_frameBufferRequestCount);
     EXPECT_EQ(scaledSize(), scaledImage->scaledSize());
-    EXPECT_FALSE(m_generator->hasAlpha());
+    EXPECT_FALSE(m_generator->hasAlpha(0));
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), scaledImage);
     EXPECT_EQ(1, m_decodersDestroyed);
 
     // Cache hit.
     const ScaledImageFragment* fullImage = m_generator->decodeAndScale(fullSize());
     EXPECT_NE(scaledImage, fullImage);
     EXPECT_EQ(fullSize(), fullImage->scaledSize());
-    EXPECT_FALSE(m_generator->hasAlpha());
+    EXPECT_FALSE(m_generator->hasAlpha(0));
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), fullImage);
 
     // Cache hit.
     const ScaledImageFragment* tempImage = m_generator->decodeAndScale(scaledSize());
     EXPECT_EQ(scaledImage, tempImage);
     EXPECT_EQ(scaledSize(), tempImage->scaledSize());
-    EXPECT_FALSE(m_generator->hasAlpha());
+    EXPECT_FALSE(m_generator->hasAlpha(0));
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
     EXPECT_EQ(1, m_frameBufferRequestCount);
 }
 
 TEST_F(ImageFrameGeneratorTest, cacheMissWithIncompleteDecode)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     const ScaledImageFragment* tempImage= m_generator->decodeAndScale(fullSize());
     EXPECT_FALSE(tempImage->isComplete());
@@ skipping 179 matching lines @@
     EXPECT_EQ(1, m_frameBufferRequestCount);
 
     ImageDecoder* tempDecoder = 0;
     EXPECT_TRUE(ImageDecodingStore::instance()->lockDecoder(m_generator.get(), fullSize(), &tempDecoder));
     ASSERT_TRUE(tempDecoder);
     EXPECT_NE(tempDecoder->frameBufferAtIndex(0)->getSkBitmap().getPixels(), tempImage->bitmap().getPixels());
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
     ImageDecodingStore::instance()->unlockDecoder(m_generator.get(), tempDecoder);
 }
 
+TEST_F(ImageFrameGeneratorTest, resumeDecodeEmptyFrame)
+{
+    m_generator = ImageFrameGenerator::create(fullSize(), m_data, false, true);
+    m_generator->setImageDecoderFactoryForTesting(MockImageDecoderFactory::create(this));
+    setFrameStatus(ImageFrame::FrameComplete);
+
+    const ScaledImageFragment* tempImage = m_generator->decodeAndScale(fullSize(), 0);
+    EXPECT_TRUE(tempImage->isComplete());
+    ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
+
+    setFrameStatus(ImageFrame::FrameEmpty);
+    EXPECT_FALSE(m_generator->decodeAndScale(fullSize(), 1));
+}
+
+TEST_F(ImageFrameGeneratorTest, frameHasAlpha)
+{
+    setFrameStatus(ImageFrame::FramePartial);
+    ImageDecodingStore::instance()->unlockCache(m_generator.get(), m_generator->decodeAndScale(fullSize(), 1));
+    EXPECT_TRUE(m_generator->hasAlpha(1));
+
+    ImageDecoder* tempDecoder = 0;
+    EXPECT_TRUE(ImageDecodingStore::instance()->lockDecoder(m_generator.get(), fullSize(), &tempDecoder));
+    ASSERT_TRUE(tempDecoder);
+    static_cast<MockImageDecoder*>(tempDecoder)->setFrameHasAlpha(false);
+    ImageDecodingStore::instance()->unlockDecoder(m_generator.get(), tempDecoder);
+
+    setFrameStatus(ImageFrame::FrameComplete);
+    ImageDecodingStore::instance()->unlockCache(m_generator.get(), m_generator->decodeAndScale(fullSize(), 1));
+    EXPECT_FALSE(m_generator->hasAlpha(1));
+}
+
 } // namespace