paint: Introduce PaintImage that wraps SkImage in paint calls.

cc/paint/skia_paint_canvas.cc

 // Copyright 2017 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/paint/paint_canvas.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/paint/display_item_list.h"
 #include "cc/paint/paint_record.h"
 #include "cc/paint/paint_recorder.h"
@@ skipping 183 matching lines @@
                                     SkScalar rx,
                                     SkScalar ry,
                                     const PaintFlags& flags) {
   canvas_->drawRoundRect(rect, rx, ry, ToSkPaint(flags));
 }
 
 void SkiaPaintCanvas::drawPath(const SkPath& path, const PaintFlags& flags) {
   canvas_->drawPath(path, ToSkPaint(flags));
 }
 
-void SkiaPaintCanvas::drawImage(sk_sp<const SkImage> image,
+void SkiaPaintCanvas::drawImage(const PaintImage& image,
                                 SkScalar left,
                                 SkScalar top,
                                 const PaintFlags* flags) {
-  canvas_->drawImage(image.get(), left, top, ToSkPaint(flags));
+  canvas_->drawImage(image.sk_image().get(), left, top, ToSkPaint(flags));
 }
 
-void SkiaPaintCanvas::drawImageRect(sk_sp<const SkImage> image,
+void SkiaPaintCanvas::drawImageRect(const PaintImage& image,
                                     const SkRect& src,
                                     const SkRect& dst,
                                     const PaintFlags* flags,
                                     SrcRectConstraint constraint) {
-  canvas_->drawImageRect(image.get(), src, dst, ToSkPaint(flags),
+  canvas_->drawImageRect(image.sk_image().get(), src, dst, ToSkPaint(flags),
                          static_cast<SkCanvas::SrcRectConstraint>(constraint));
 }
 
 void SkiaPaintCanvas::drawBitmap(const SkBitmap& bitmap,
                                  SkScalar left,
                                  SkScalar top,
                                  const PaintFlags* flags) {
   canvas_->drawBitmap(bitmap, left, top, ToSkPaint(flags));
 }
 
@@ skipping 75 matching lines @@
       break;
     case AnnotationType::NAMED_DESTINATION: {
       SkPoint point = SkPoint::Make(rect.x(), rect.y());
       SkAnnotateNamedDestination(canvas_, point, data.get());
       break;
     }
   }
 }
 
 }  // namespace cc