Clean up cc/paint interfaces

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/paint_record.h"
 #include "cc/paint/paint_recorder.h"
 #include "third_party/skia/include/core/SkAnnotation.h"
@@ skipping 87 matching lines @@
 }
 
 void SkiaPaintCanvas::scale(SkScalar sx, SkScalar sy) {
   canvas_->scale(sx, sy);
 }
 
 void SkiaPaintCanvas::rotate(SkScalar degrees) {
   canvas_->rotate(degrees);
 }
 
-void SkiaPaintCanvas::rotate(SkScalar degrees, SkScalar px, SkScalar py) {
-  canvas_->rotate(degrees, px, py);
-}
-
 void SkiaPaintCanvas::concat(const SkMatrix& matrix) {
   canvas_->concat(matrix);
 }
 
 void SkiaPaintCanvas::setMatrix(const SkMatrix& matrix) {
   canvas_->setMatrix(matrix);
 }
 
-void SkiaPaintCanvas::resetMatrix() {
-  canvas_->resetMatrix();
-}
-
 void SkiaPaintCanvas::clipRect(const SkRect& rect,
                                SkClipOp op,
                                bool do_anti_alias) {
   canvas_->clipRect(rect, op, do_anti_alias);
 }
 
 void SkiaPaintCanvas::clipRRect(const SkRRect& rrect,
                                 SkClipOp op,
                                 bool do_anti_alias) {
   canvas_->clipRRect(rrect, op, do_anti_alias);
@@ skipping 87 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(const SkImage* image,
+void SkiaPaintCanvas::drawImage(sk_sp<const SkImage> image,
                                 SkScalar left,
                                 SkScalar top,
                                 const PaintFlags* flags) {
-  canvas_->drawImage(image, left, top, ToSkPaint(flags));
+  canvas_->drawImage(image.get(), left, top, ToSkPaint(flags));
 }
 
-void SkiaPaintCanvas::drawImage(const sk_sp<SkImage>& image,
-                                SkScalar left,
-                                SkScalar top,
-                                const PaintFlags* flags) {
-  canvas_->drawImage(image, left, top, ToSkPaint(flags));
-}
-
-void SkiaPaintCanvas::drawImageRect(const SkImage* image,
+void SkiaPaintCanvas::drawImageRect(sk_sp<const SkImage> image,
                                     const SkRect& src,
                                     const SkRect& dst,
                                     const PaintFlags* flags,
                                     SrcRectConstraint constraint) {
-  canvas_->drawImageRect(image, src, dst, ToSkPaint(flags),
+  canvas_->drawImageRect(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));
 }
 
 void SkiaPaintCanvas::drawText(const void* text,
                                size_t byte_length,
                                SkScalar x,
                                SkScalar y,
                                const PaintFlags& flags) {
   canvas_->drawText(text, byte_length, x, y, ToSkPaint(flags));
 }
 
 void SkiaPaintCanvas::drawPosText(const void* text,
                                   size_t byte_length,
                                   const SkPoint pos[],
                                   const PaintFlags& flags) {
   canvas_->drawPosText(text, byte_length, pos, ToSkPaint(flags));
 }
 
-void SkiaPaintCanvas::drawTextBlob(const SkTextBlob* blob,
+void SkiaPaintCanvas::drawTextBlob(sk_sp<SkTextBlob> blob,
                                    SkScalar x,
                                    SkScalar y,
                                    const PaintFlags& flags) {
-  canvas_->drawTextBlob(blob, x, y, ToSkPaint(flags));
+  canvas_->drawTextBlob(blob.get(), x, y, ToSkPaint(flags));
 }
 
-void SkiaPaintCanvas::drawTextBlob(const sk_sp<SkTextBlob>& blob,
-                                   SkScalar x,
-                                   SkScalar y,
-                                   const PaintFlags& flags) {
-  canvas_->drawTextBlob(blob, x, y, ToSkPaint(flags));
-}
-
-void SkiaPaintCanvas::drawPicture(const PaintRecord* record) {
-  canvas_->drawPicture(ToSkPicture(record));
-}
-
-void SkiaPaintCanvas::drawPicture(const PaintRecord* record,
+void SkiaPaintCanvas::drawPicture(sk_sp<const PaintRecord> record,
                                   const SkMatrix* matrix,
                                   const PaintFlags* flags) {
-  canvas_->drawPicture(ToSkPicture(record), matrix, ToSkPaint(flags));
-}
-
-void SkiaPaintCanvas::drawPicture(sk_sp<PaintRecord> record) {
-  drawPicture(record.get());
+  canvas_->drawPicture(ToSkPicture(record.get()), matrix, ToSkPaint(flags));
 }
 
 bool SkiaPaintCanvas::isClipEmpty() const {
   return canvas_->isClipEmpty();
 }
 
 bool SkiaPaintCanvas::isClipRect() const {
   return canvas_->isClipRect();
 }
 
@@ skipping 28 matching lines @@
                                                SkData* data) {
   SkAnnotateNamedDestination(canvas_, point, data);
 }
 
 void SkiaPaintCanvas::AnnotateLinkToDestination(const SkRect& rect,
                                                 SkData* data) {
   SkAnnotateLinkToDestination(canvas_, rect, data);
 }
 
 }  // namespace cc