Use PaintImage in cc QueueImageDecode

cc/tiles/image_controller.cc

Index: cc/tiles/image_controller.cc
diff --git a/cc/tiles/image_controller.cc b/cc/tiles/image_controller.cc
index e8021e4264e0f41845b646f9fa974b3c3c4910d2..70210514f5702e5df2b3070f9539c164d5bce93b 100644
--- a/cc/tiles/image_controller.cc
+++ b/cc/tiles/image_controller.cc
@@ -178,7 +178,7 @@ std::vector<scoped_refptr<TileTask>> ImageController::SetPredecodeImages(
 }
 
 ImageController::ImageDecodeRequestId ImageController::QueueImageDecode(
-    sk_sp<const SkImage> image,
+    const PaintImage& image,
     const ImageDecodedCallback& callback) {
   // We must not receive any image requests if we have no worker.
   CHECK(worker_task_runner_);
@@ -193,14 +193,10 @@ ImageController::ImageDecodeRequestId ImageController::QueueImageDecode(
   gfx::ColorSpace target_color_space;
 
   DCHECK(image);
-  bool is_image_lazy = image->isLazyGenerated();
-  auto image_bounds = image->bounds();
-  // TODO(khushalsagar): Eliminate the use of an incorrect id here and have all
-  // call-sites provide PaintImage to the ImageController.
-  DrawImage draw_image(
-      PaintImage(PaintImage::kUnknownStableId,
-                 sk_sp<SkImage>(const_cast<SkImage*>(image.release()))),
-      image_bounds, kNone_SkFilterQuality, SkMatrix::I(), target_color_space);
+  bool is_image_lazy = image.sk_image()->isLazyGenerated();
+  auto image_bounds = image.sk_image()->bounds();
+  DrawImage draw_image(PaintImage(image), image_bounds, kNone_SkFilterQuality,
+                       SkMatrix::I(), target_color_space);
 
   // Get the tasks for this decode.
   scoped_refptr<TileTask> task;