cc: Keep PaintImage in DrawImage.

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 177 matching lines @@
 
   // 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();
-  DrawImage draw_image(std::move(image), image_bounds, kNone_SkFilterQuality,
-                       SkMatrix::I(), target_color_space);
+  // 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);
 
   // 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