Deferred GIF image decodes should report decode failures

third_party/WebKit/Source/platform/graphics/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 110 matching lines @@
     ImageFrame::Status m_status;
     ImageFrame::Status m_nextFrameStatus;
     size_t m_frameCount;
 };
 
 TEST_F(ImageFrameGeneratorTest, incompleteDecode)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     char buffer[100 * 100 * 4];
-    m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
     EXPECT_EQ(1, m_decodeRequestCount);
 
     addNewData();
-    m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
     EXPECT_EQ(2, m_decodeRequestCount);
     EXPECT_EQ(0, m_decodersDestroyed);
 }
 
 TEST_F(ImageFrameGeneratorTest, incompleteDecodeBecomesComplete)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     char buffer[100 * 100 * 4];
-    m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
     EXPECT_EQ(1, m_decodeRequestCount);
     EXPECT_EQ(0, m_decodersDestroyed);
 
     setFrameStatus(ImageFrame::FrameComplete);
     addNewData();
 
-    m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
     EXPECT_EQ(2, m_decodeRequestCount);
     EXPECT_EQ(1, m_decodersDestroyed);
 
     // Decoder created again.
-    m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
     EXPECT_EQ(3, m_decodeRequestCount);
 }
 
 static void decodeThreadMain(ImageFrameGenerator* generator)
 {
     char buffer[100 * 100 * 4];
-    generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
 }
 
 static void decodeThreadWithRefEncodedMain(ImageFrameGenerator* generator)
 {
     // Image must be complete - refEncodedData otherwise returns null.
     char buffer[100 * 100 * 4];
     SkData* data = generator->refEncodedData();
-    generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
     data->unref();
 }
 
 TEST_F(ImageFrameGeneratorTest, incompleteDecodeBecomesCompleteMultiThreaded)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     char buffer[100 * 100 * 4];
-    m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
     EXPECT_EQ(1, m_decodeRequestCount);
     EXPECT_EQ(0, m_decodersDestroyed);
     SkData* data = m_generator->refEncodedData();
     EXPECT_EQ(nullptr, data);
 
     // LocalFrame can now be decoded completely.
     setFrameStatus(ImageFrame::FrameComplete);
     addNewData();
     // addNewData is calling m_generator->setData with allDataReceived == false, which means that
     // refEncodedData should return null.
     data = m_generator->refEncodedData();
     EXPECT_EQ(nullptr, data);
     OwnPtr<WebThread> thread = adoptPtr(Platform::current()->createThread("DecodeThread"));
     thread->taskRunner()->postTask(BLINK_FROM_HERE, new Task(threadSafeBind(&decodeThreadMain, AllowCrossThreadAccess(m_generator.get()))));
     thread.clear();
     EXPECT_EQ(2, m_decodeRequestCount);
     EXPECT_EQ(1, m_decodersDestroyed);
 
     // Decoder created again.
-    m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
     EXPECT_EQ(3, m_decodeRequestCount);
 
     addNewData(true);
     data = m_generator->refEncodedData();
     ASSERT_TRUE(data);
     // To prevent data writting, SkData::unique() should be false.
     ASSERT_TRUE(!data->unique());
 
     // Thread will also ref and unref the data.
     thread = adoptPtr(Platform::current()->createThread("RefEncodedDataThread"));
@@ skipping 12 matching lines @@
     m_generator = nullptr;
     ASSERT_TRUE(data->unique());
     data->unref();
 }
 
 TEST_F(ImageFrameGeneratorTest, frameHasAlpha)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     char buffer[100 * 100 * 4];
-    m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
     EXPECT_TRUE(m_generator->hasAlpha(0));
     EXPECT_EQ(1, m_decodeRequestCount);
 
     ImageDecoder* tempDecoder = 0;
     EXPECT_TRUE(ImageDecodingStore::instance().lockDecoder(m_generator.get(), fullSize(), &tempDecoder));
     ASSERT_TRUE(tempDecoder);
     tempDecoder->frameBufferAtIndex(0)->setHasAlpha(false);
     ImageDecodingStore::instance().unlockDecoder(m_generator.get(), tempDecoder);
     EXPECT_EQ(2, m_decodeRequestCount);
 
     setFrameStatus(ImageFrame::FrameComplete);
-    m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
     EXPECT_EQ(3, m_decodeRequestCount);
     EXPECT_FALSE(m_generator->hasAlpha(0));
 }
 
 TEST_F(ImageFrameGeneratorTest, removeMultiFrameDecoder)
 {
     setFrameCount(3);
     setFrameStatus(ImageFrame::FrameComplete);
 
     char buffer[100 * 100 * 4];
-    m_generator->decodeAndScale(imageInfo(), 0, buffer, 100 * 4);
+    m_generator->decodeAndScale(0, imageInfo(), buffer, 100 * 4);
     EXPECT_EQ(1, m_decodeRequestCount);
     EXPECT_EQ(0, m_decodersDestroyed);
 
     setFrameStatus(ImageFrame::FrameComplete);
 
-    m_generator->decodeAndScale(imageInfo(), 1, buffer, 100 * 4);
+    m_generator->decodeAndScale(1, imageInfo(), buffer, 100 * 4);
     EXPECT_EQ(2, m_decodeRequestCount);
     EXPECT_EQ(0, m_decodersDestroyed);
 
     setFrameStatus(ImageFrame::FrameComplete);
 
     // Multi frame decoder should be removed.
-    m_generator->decodeAndScale(imageInfo(), 2, buffer, 100 * 4);
+    m_generator->decodeAndScale(2, imageInfo(), buffer, 100 * 4);
     EXPECT_EQ(3, m_decodeRequestCount);
     EXPECT_EQ(1, m_decodersDestroyed);
 }
 
 } // namespace blink