Use PaintImage in cc QueueImageDecode

cc/tiles/image_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/tiles/image_controller.h"
 
 #include "base/bind.h"
 #include "base/task_scheduler/post_task.h"
 #include "base/task_scheduler/task_traits.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 160 matching lines @@
     std::vector<DrawImage> images,
     const ImageDecodeCache::TracingInfo& tracing_info) {
   std::vector<scoped_refptr<TileTask>> new_tasks;
   GetTasksForImagesAndRef(&images, &new_tasks, tracing_info);
   UnrefImages(predecode_locked_images_);
   predecode_locked_images_ = std::move(images);
   return new_tasks;
 }
 
 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_);
 
   // Generate the next id.
   ImageDecodeRequestId id = s_next_image_decode_queue_id_++;
 
   // TODO(ccameron): The target color space specified here should match the
   // target color space that will be used at rasterization time. Leave this
   // unspecified now, since that will match the rasterization-time color
   // space while color correct rendering is disabled.
   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;
   bool need_unref = false;
   if (is_image_lazy) {
     need_unref =
         cache_->GetOutOfRasterDecodeTaskForImageAndRef(draw_image, &task);
   }
   // If we don't need to unref this, we don't actually have a task.
   DCHECK(need_unref || !task);
@@ skipping 164 matching lines @@
 ImageController::ImageDecodeRequest::ImageDecodeRequest(
     const ImageDecodeRequest& other) = default;
 ImageController::ImageDecodeRequest::~ImageDecodeRequest() = default;
 
 ImageController::ImageDecodeRequest& ImageController::ImageDecodeRequest::
 operator=(ImageDecodeRequest&& other) = default;
 ImageController::ImageDecodeRequest& ImageController::ImageDecodeRequest::
 operator=(const ImageDecodeRequest& other) = default;
 
 }  // namespace cc