Refactor ImageDecoder factories

third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.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 157 matching lines @@
     RefPtr<SharedBuffer> m_data;
     size_t m_frameCount;
     int m_repetitionCount;
     ImageFrame::Status m_status;
     float m_frameDuration;
     IntSize m_decodedSize;
 };
 
 TEST_F(DeferredImageDecoderTest, drawIntoSkPicture)
 {
-    m_lazyDecoder->setData(*m_data, true);
+    m_lazyDecoder->setData(m_data, true);
     RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
     ASSERT_TRUE(image);
     EXPECT_EQ(1, image->width());
     EXPECT_EQ(1, image->height());
 
     SkPictureRecorder recorder;
     SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
     tempCanvas->drawImage(image.get(), 0, 0);
     sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
     EXPECT_EQ(0, m_decodeRequestCount);
 
     m_surface->getCanvas()->drawPicture(picture);
     EXPECT_EQ(0, m_decodeRequestCount);
 
     SkBitmap canvasBitmap;
     canvasBitmap.allocN32Pixels(100, 100);
     ASSERT_TRUE(m_surface->getCanvas()->readPixels(&canvasBitmap, 0, 0));
     SkAutoLockPixels autoLock(canvasBitmap);
     EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0));
 }
 
 TEST_F(DeferredImageDecoderTest, drawIntoSkPictureProgressive)
 {
     RefPtr<SharedBuffer> partialData = SharedBuffer::create(m_data->data(), m_data->size() - 10);
 
     // Received only half the file.
-    m_lazyDecoder->setData(*partialData, false);
+    m_lazyDecoder->setData(partialData, false);
     RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
     ASSERT_TRUE(image);
     SkPictureRecorder recorder;
     SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
     tempCanvas->drawImage(image.get(), 0, 0);
     m_surface->getCanvas()->drawPicture(recorder.finishRecordingAsPicture());
 
     // Fully received the file and draw the SkPicture again.
-    m_lazyDecoder->setData(*m_data, true);
+    m_lazyDecoder->setData(m_data, true);
     image = m_lazyDecoder->createFrameAtIndex(0);
     ASSERT_TRUE(image);
     tempCanvas = recorder.beginRecording(100, 100, 0, 0);
     tempCanvas->drawImage(image.get(), 0, 0);
     m_surface->getCanvas()->drawPicture(recorder.finishRecordingAsPicture());
 
     SkBitmap canvasBitmap;
     canvasBitmap.allocN32Pixels(100, 100);
     ASSERT_TRUE(m_surface->getCanvas()->readPixels(&canvasBitmap, 0, 0));
     SkAutoLockPixels autoLock(canvasBitmap);
     EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0));
 }
 
 static void rasterizeMain(SkCanvas* canvas, SkPicture* picture)
 {
     canvas->drawPicture(picture);
 }
 
 TEST_F(DeferredImageDecoderTest, decodeOnOtherThread)
 {
-    m_lazyDecoder->setData(*m_data, true);
+    m_lazyDecoder->setData(m_data, true);
     RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
     ASSERT_TRUE(image);
     EXPECT_EQ(1, image->width());
     EXPECT_EQ(1, image->height());
 
     SkPictureRecorder recorder;
     SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
     tempCanvas->drawImage(image.get(), 0, 0);
     sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
     EXPECT_EQ(0, m_decodeRequestCount);
 
     // Create a thread to rasterize SkPicture.
     std::unique_ptr<WebThread> thread = wrapUnique(Platform::current()->createThread("RasterThread"));
     thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, crossThreadBind(&rasterizeMain, crossThreadUnretained(m_surface->getCanvas()), crossThreadUnretained(picture.get())));
     thread.reset();
     EXPECT_EQ(0, m_decodeRequestCount);
 
     SkBitmap canvasBitmap;
     canvasBitmap.allocN32Pixels(100, 100);
     ASSERT_TRUE(m_surface->getCanvas()->readPixels(&canvasBitmap, 0, 0));
     SkAutoLockPixels autoLock(canvasBitmap);
     EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0));
 }
 
 TEST_F(DeferredImageDecoderTest, singleFrameImageLoading)
 {
     m_status = ImageFrame::FramePartial;
-    m_lazyDecoder->setData(*m_data, false);
+    m_lazyDecoder->setData(m_data, false);
     EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
     RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
     ASSERT_TRUE(image);
     unsigned firstId = image->uniqueID();
     EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
     EXPECT_TRUE(m_actualDecoder);
 
     m_status = ImageFrame::FrameComplete;
     m_data->append(" ", 1u);
-    m_lazyDecoder->setData(*m_data, true);
+    m_lazyDecoder->setData(m_data, true);
     EXPECT_FALSE(m_actualDecoder);
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(0));
 
     image = m_lazyDecoder->createFrameAtIndex(0);
     ASSERT_TRUE(image);
     unsigned secondId = image->uniqueID();
     EXPECT_FALSE(m_decodeRequestCount);
     EXPECT_NE(firstId, secondId);
 }
 
 TEST_F(DeferredImageDecoderTest, multiFrameImageLoading)
 {
     m_repetitionCount = 10;
     m_frameCount = 1;
     m_frameDuration = 10;
     m_status = ImageFrame::FramePartial;
-    m_lazyDecoder->setData(*m_data, false);
+    m_lazyDecoder->setData(m_data, false);
 
     RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
     ASSERT_TRUE(image);
     unsigned firstId = image->uniqueID();
     EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
     EXPECT_EQ(10.0f, m_lazyDecoder->frameDurationAtIndex(0));
 
     m_frameCount = 2;
     m_frameDuration = 20;
     m_status = ImageFrame::FrameComplete;
     m_data->append(" ", 1u);
-    m_lazyDecoder->setData(*m_data, false);
+    m_lazyDecoder->setData(m_data, false);
 
     image = m_lazyDecoder->createFrameAtIndex(0);
     ASSERT_TRUE(image);
     unsigned secondId = image->uniqueID();
     EXPECT_NE(firstId, secondId);
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(0));
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(1));
     EXPECT_EQ(20.0f, m_lazyDecoder->frameDurationAtIndex(1));
     EXPECT_TRUE(m_actualDecoder);
 
     m_frameCount = 3;
     m_frameDuration = 30;
     m_status = ImageFrame::FrameComplete;
-    m_lazyDecoder->setData(*m_data, true);
+    m_lazyDecoder->setData(m_data, true);
     EXPECT_FALSE(m_actualDecoder);
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(0));
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(1));
     EXPECT_TRUE(m_lazyDecoder->frameIsCompleteAtIndex(2));
     EXPECT_EQ(10.0f, m_lazyDecoder->frameDurationAtIndex(0));
     EXPECT_EQ(20.0f, m_lazyDecoder->frameDurationAtIndex(1));
     EXPECT_EQ(30.0f, m_lazyDecoder->frameDurationAtIndex(2));
     EXPECT_EQ(10, m_lazyDecoder->repetitionCount());
 }
 
 TEST_F(DeferredImageDecoderTest, decodedSize)
 {
     m_decodedSize = IntSize(22, 33);
-    m_lazyDecoder->setData(*m_data, true);
+    m_lazyDecoder->setData(m_data, true);
     RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
     ASSERT_TRUE(image);
     EXPECT_EQ(m_decodedSize.width(), image->width());
     EXPECT_EQ(m_decodedSize.height(), image->height());
 
     useMockImageDecoderFactory();
 
     // The following code should not fail any assert.
     SkPictureRecorder recorder;
     SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
     tempCanvas->drawImage(image.get(), 0, 0);
     sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
     EXPECT_EQ(0, m_decodeRequestCount);
     m_surface->getCanvas()->drawPicture(picture);
     EXPECT_EQ(1, m_decodeRequestCount);
 }
 
 TEST_F(DeferredImageDecoderTest, smallerFrameCount)
 {
     m_frameCount = 1;
-    m_lazyDecoder->setData(*m_data, false);
+    m_lazyDecoder->setData(m_data, false);
     EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
     m_frameCount = 2;
-    m_lazyDecoder->setData(*m_data, false);
+    m_lazyDecoder->setData(m_data, false);
     EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
     m_frameCount = 0;
-    m_lazyDecoder->setData(*m_data, true);
+    m_lazyDecoder->setData(m_data, true);
     EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
 }
 
 TEST_F(DeferredImageDecoderTest, frameOpacity)
 {
-    std::unique_ptr<ImageDecoder> actualDecoder = ImageDecoder::create(ImageDecoder::determineImageType(*m_data),
+    std::unique_ptr<DeferredImageDecoder> decoder = DeferredImageDecoder::create(m_data, true,
         ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileApplied);
-    std::unique_ptr<DeferredImageDecoder> decoder = DeferredImageDecoder::createForTesting(std::move(actualDecoder));
-    decoder->setData(*m_data, true);
 
     SkImageInfo pixInfo = SkImageInfo::MakeN32Premul(1, 1);
 
     size_t rowBytes = pixInfo.minRowBytes();
     size_t size = pixInfo.getSafeSize(rowBytes);
 
     SkAutoMalloc storage(size);
     SkPixmap pixmap(pixInfo, storage.get(), rowBytes);
 
     // Before decoding, the frame is not known to be opaque.
@@ skipping 15 matching lines @@
 
 // The DeferredImageDecoder would sometimes assume that a frame was a certain
 // size even if the actual decoder reported it had a size of 0 bytes. This test
 // verifies that it's fixed by always checking with the actual decoder when
 // creating a frame.
 TEST_F(DeferredImageDecoderTest, respectActualDecoderSizeOnCreate)
 {
     m_data = SharedBuffer::create(animatedGIF, sizeof(animatedGIF));
     m_frameCount = 2;
     forceFirstFrameToBeEmpty();
-    m_lazyDecoder->setData(*m_data, false);
+    m_lazyDecoder->setData(m_data, false);
     m_lazyDecoder->createFrameAtIndex(0);
     m_lazyDecoder->createFrameAtIndex(1);
-    m_lazyDecoder->setData(*m_data, true);
+    m_lazyDecoder->setData(m_data, true);
     // Clears only the first frame (0 bytes). If DeferredImageDecoder doesn't
     // check with the actual decoder it reports 4 bytes instead.
     size_t frameBytesCleared = m_lazyDecoder->clearCacheExceptFrame(1);
     EXPECT_EQ(static_cast<size_t>(0), frameBytesCleared);
 }
 
 TEST_F(DeferredImageDecoderTest, data)
 {
     RefPtr<SharedBuffer> originalData = SharedBuffer::create(m_data->data(), m_data->size());
     EXPECT_EQ(originalData->size(), m_data->size());
-    m_lazyDecoder->setData(*originalData, false);
+    m_lazyDecoder->setData(originalData, false);
     RefPtr<SharedBuffer> newData = m_lazyDecoder->data();
     EXPECT_EQ(originalData->size(), newData->size());
     EXPECT_EQ(0, std::memcmp(originalData->data(), newData->data(), newData->size()));
 }
 
 } // namespace blink