cc: Keep PaintImage in DrawImage.

cc/test/fake_content_layer_client.cc

 // Copyright 2012 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/test/fake_content_layer_client.h"
 
 #include <stddef.h>
 
 #include "cc/paint/clip_display_item.h"
 #include "cc/paint/drawing_display_item.h"
 #include "cc/paint/paint_canvas.h"
 #include "cc/paint/paint_recorder.h"
 #include "cc/paint/transform_display_item.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
-FakeContentLayerClient::ImageData::ImageData(sk_sp<SkImage> img,
+FakeContentLayerClient::ImageData::ImageData(PaintImage img,
                                              const gfx::Point& point,
                                              const PaintFlags& flags)
     : image(std::move(img)), point(point), flags(flags) {}
 
-FakeContentLayerClient::ImageData::ImageData(sk_sp<SkImage> img,
+FakeContentLayerClient::ImageData::ImageData(PaintImage img,
                                              const gfx::Transform& transform,
                                              const PaintFlags& flags)
     : image(std::move(img)), transform(transform), flags(flags) {}
 
 FakeContentLayerClient::ImageData::ImageData(const ImageData& other) = default;
 
 FakeContentLayerClient::ImageData::~ImageData() {}
 
 FakeContentLayerClient::FakeContentLayerClient()
     : fill_with_nonsolid_color_(false),
@@ skipping 27 matching lines @@
     display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
         ToEnclosingRect(draw_rect), recorder.finishRecordingAsPicture());
   }
 
   for (ImageVector::const_iterator it = draw_images_.begin();
        it != draw_images_.end(); ++it) {
     if (!it->transform.IsIdentity()) {
       display_list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(
           it->transform);
     }
-    PaintCanvas* canvas =
-        recorder.beginRecording(it->image->width(), it->image->height());
-    canvas->drawImage(PaintImage(PaintImage::GetNextId(), it->image),
-                      it->point.x(), it->point.y(), &it->flags);
+    PaintCanvas* canvas = recorder.beginRecording(
+        it->image.sk_image()->width(), it->image.sk_image()->height());
+    canvas->drawImage(it->image, it->point.x(), it->point.y(), &it->flags);
     display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
         PaintableRegion(), recorder.finishRecordingAsPicture());
     if (!it->transform.IsIdentity()) {
       display_list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
     }
   }
 
   if (fill_with_nonsolid_color_) {
     gfx::Rect draw_rect = PaintableRegion();
     bool red = true;
@@ skipping 13 matching lines @@
   return display_list;
 }
 
 bool FakeContentLayerClient::FillsBoundsCompletely() const { return false; }
 
 size_t FakeContentLayerClient::GetApproximateUnsharedMemoryUsage() const {
   return reported_memory_usage_;
 }
 
 }  // namespace cc