cc: Keep PaintImage in DrawImage.

cc/paint/discardable_image_store.cc

Index: cc/paint/discardable_image_store.cc
diff --git a/cc/paint/discardable_image_store.cc b/cc/paint/discardable_image_store.cc
index 3ec50f2a742b872815d7391fbc4692c45f370d5a..81387eefda0eb894424298f4f628918fd1d78c79 100644
--- a/cc/paint/discardable_image_store.cc
+++ b/cc/paint/discardable_image_store.cc
@@ -188,19 +188,18 @@ void DiscardableImageStore::AddImageFromFlags(const SkRect& rect,
                              PaintImage::CompletionState::UNKNOWN);
       // TODO(ericrk): Handle cases where we only need a sub-rect from the
       // image. crbug.com/671821
-      AddImage(paint_image, SkRect::MakeFromIRect(image->bounds()), rect,
-               &matrix, flags);
+      AddImage(std::move(paint_image), SkRect::MakeFromIRect(image->bounds()),
+               rect, &matrix, flags);
     }
   }
 }
 
-void DiscardableImageStore::AddImage(const PaintImage& paint_image,
+void DiscardableImageStore::AddImage(PaintImage paint_image,
                                      const SkRect& src_rect,
                                      const SkRect& rect,
                                      const SkMatrix* local_matrix,
                                      const PaintFlags& flags) {
-  sk_sp<const SkImage> sk_image = paint_image.sk_image();
-  if (!sk_image->isLazyGenerated())
+  if (!paint_image.sk_image()->isLazyGenerated())
     return;
 
   const SkRect& clip_rect = SkRect::Make(canvas_->getDeviceClipBounds());
@@ -244,11 +243,10 @@ void DiscardableImageStore::AddImage(const PaintImage& paint_image,
   if (local_matrix)
     matrix.postConcat(*local_matrix);
 
-  // TODO(khushalsagar): Keep PaintImage in DrawImage.
-  (*image_id_to_rect_)[sk_image->uniqueID()].Union(image_rect);
+  (*image_id_to_rect_)[paint_image.stable_id()].Union(image_rect);
   image_set_->push_back(
-      std::make_pair(DrawImage(std::move(sk_image), src_irect, filter_quality,
-                               matrix, target_color_space),
+      std::make_pair(DrawImage(std::move(paint_image), src_irect,
+                               filter_quality, matrix, target_color_space),
                      image_rect));
 }