Refactor ImageDecoder factories

third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp

Index: third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp
index 48faa2a32c499ed71ecbe23f404db875e75de2f2..1c267a810c5e413b92ed6fabb340ee2594edbf94 100644
--- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp
+++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp
@@ -35,15 +35,14 @@ static void mixImages(const char* fileName, size_t bytesForFirstFrame, size_t la
     RefPtr<SharedBuffer> file = readFile(fileName);
     ASSERT_NE(file, nullptr);
 
-    std::unique_ptr<DeferredImageDecoder> decoder = DeferredImageDecoder::create(ImageDecoder::determineImageType(*file.get()), ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileIgnored);
-    ASSERT_TRUE(decoder.get());
-
     RefPtr<SharedBuffer> partialFile = SharedBuffer::create(file->data(), bytesForFirstFrame);
-    decoder->setData(*partialFile.get(), false);
+    std::unique_ptr<DeferredImageDecoder> decoder = DeferredImageDecoder::create(partialFile, false,
+        ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileIgnored);
+    ASSERT_NE(decoder, nullptr);
     RefPtr<SkImage> partialImage = decoder->createFrameAtIndex(0);
 
     RefPtr<SharedBuffer> almostCompleteFile = SharedBuffer::create(file->data(), file->size() - 1);
-    decoder->setData(*almostCompleteFile.get(), false);
+    decoder->setData(almostCompleteFile, false);
     RefPtr<SkImage> imageWithMoreData = decoder->createFrameAtIndex(laterFrame);
 
     imageWithMoreData->preroll();
@@ -84,14 +83,13 @@ TEST(DeferredImageDecoderTestWoPlatform, fragmentedSignature)
 {
     struct {
         const char* m_file;
-        ImageDecoder::SniffResult m_expectedResult;

[Peter Kasting, 2016/08/19 23:04:58]

It seems like we've lost the functionality of checking that the correct type is
sniffed.  Is that tested elsewhere?  If so, remove the struct wrapper around the
single remaining member.  If not, check the image type of the resulting image
decoder.

[f(malita), 2016/08/22 01:51:15]

Indeed.  I would hope we have other tests to verify correct decoder selection,
but it's also trivial to update this one and check as you suggested.  Done.

     } tests[] = {
-        { "/LayoutTests/fast/images/resources/animated.gif", ImageDecoder::SniffResult::GIF },
-        { "/LayoutTests/fast/images/resources/mu.png", ImageDecoder::SniffResult::PNG },
-        { "/LayoutTests/fast/images/resources/2-dht.jpg", ImageDecoder::SniffResult::JPEG },
-        { "/LayoutTests/fast/images/resources/webp-animated.webp", ImageDecoder::SniffResult::WEBP },
-        { "/LayoutTests/fast/images/resources/lenna.bmp", ImageDecoder::SniffResult::BMP },
-        { "/LayoutTests/fast/images/resources/wrong-frame-dimensions.ico", ImageDecoder::SniffResult::ICO },
+        { "/LayoutTests/fast/images/resources/animated.gif" },
+        { "/LayoutTests/fast/images/resources/mu.png" },
+        { "/LayoutTests/fast/images/resources/2-dht.jpg" },
+        { "/LayoutTests/fast/images/resources/webp-animated.webp" },
+        { "/LayoutTests/fast/images/resources/lenna.bmp" },
+        { "/LayoutTests/fast/images/resources/wrong-frame-dimensions.ico" },
     };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(tests); ++i) {
@@ -102,13 +100,17 @@ TEST(DeferredImageDecoderTestWoPlatform, fragmentedSignature)
         ASSERT_EQ(skData->size(), fileBuffer->size());
         const char* data = reinterpret_cast<const char*>(skData->bytes());
 
-        // Truncated signature (only 1 byte)
+        // Truncated signature (only 1 byte).  Decoder instantiation should fail.
         RefPtr<SharedBuffer> buffer = SharedBuffer::create<size_t>(data, 1u);
-        ASSERT_EQ(ImageDecoder::determineImageType(*buffer), ImageDecoder::SniffResult::InsufficientData);
+        ASSERT_FALSE(ImageDecoder::isSufficientData(*buffer));
+        ASSERT_EQ(nullptr, DeferredImageDecoder::create(buffer, false,
+            ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileIgnored));
 
         // Append the rest of the data.  We should be able to sniff the signature now, even if segmented.
         buffer->append<size_t>(data + 1, skData->size() - 1);
-        ASSERT_EQ(ImageDecoder::determineImageType(*buffer), tests[i].m_expectedResult);
+        ASSERT_TRUE(ImageDecoder::isSufficientData(*buffer));
+        ASSERT_NE(nullptr, DeferredImageDecoder::create(buffer, false,
+            ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileIgnored));
     }
 }