Plumb PaintImage to the PictureImageLayer.

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

Index: third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp
index e2f7a09f651d255c95e2c2d8b3b3270dd2250e0e..f069ebcf596782be8d8eb92defa756993f726d39 100644
--- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp
@@ -163,10 +163,7 @@ TEST_F(DeferredImageDecoderTest, drawIntoPaintRecord) {
 
   PaintRecorder recorder;
   PaintCanvas* temp_canvas = recorder.beginRecording(100, 100);
-  temp_canvas->drawImage(
-      PaintImage(std::move(image), PaintImage::AnimationType::STATIC,
-                 PaintImage::CompletionState::DONE),
-      0, 0);
+  temp_canvas->drawImage(PaintImage(std::move(image)), 0, 0);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, decode_request_count_);
 
@@ -196,10 +193,7 @@ TEST_F(DeferredImageDecoderTest, drawIntoPaintRecordProgressive) {
   image = lazy_decoder_->CreateFrameAtIndex(0);
   ASSERT_TRUE(image);
   temp_canvas = recorder.beginRecording(100, 100);
-  temp_canvas->drawImage(
-      PaintImage(std::move(image), PaintImage::AnimationType::STATIC,
-                 PaintImage::CompletionState::DONE),
-      0, 0);
+  temp_canvas->drawImage(PaintImage(std::move(image)), 0, 0);
   canvas_->drawPicture(recorder.finishRecordingAsPicture());
   EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), bitmap_.getColor(0, 0));
 }
@@ -217,10 +211,7 @@ TEST_F(DeferredImageDecoderTest, decodeOnOtherThread) {
 
   PaintRecorder recorder;
   PaintCanvas* temp_canvas = recorder.beginRecording(100, 100);
-  temp_canvas->drawImage(
-      PaintImage(std::move(image), PaintImage::AnimationType::STATIC,
-                 PaintImage::CompletionState::DONE),
-      0, 0);
+  temp_canvas->drawImage(PaintImage(std::move(image)), 0, 0);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, decode_request_count_);
 
@@ -314,10 +305,7 @@ TEST_F(DeferredImageDecoderTest, decodedSize) {
   // The following code should not fail any assert.
   PaintRecorder recorder;
   PaintCanvas* temp_canvas = recorder.beginRecording(100, 100);
-  temp_canvas->drawImage(
-      PaintImage(std::move(image), PaintImage::AnimationType::STATIC,
-                 PaintImage::CompletionState::DONE),
-      0, 0);
+  temp_canvas->drawImage(PaintImage(std::move(image)), 0, 0);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, decode_request_count_);
   canvas_->drawPicture(record);