Clean up cc/paint interfaces

cc/paint/skia_paint_canvas.cc

Index: cc/paint/skia_paint_canvas.cc
diff --git a/cc/paint/skia_paint_canvas.cc b/cc/paint/skia_paint_canvas.cc
index 5928cecc78f5286773b8f5eb6770bf12cb2bd7f6..03e05aed5ccb5d337a38f26dd13e1ad2cfab7d71 100644
--- a/cc/paint/skia_paint_canvas.cc
+++ b/cc/paint/skia_paint_canvas.cc
@@ -105,10 +105,6 @@ 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);
 }
@@ -117,10 +113,6 @@ 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) {
@@ -228,26 +220,19 @@ void SkiaPaintCanvas::drawPath(const SkPath& path, const PaintFlags& flags) {
   canvas_->drawPath(path, ToSkPaint(flags));
 }
 
-void SkiaPaintCanvas::drawImage(const SkImage* image,
-                                SkScalar left,
-                                SkScalar top,
-                                const PaintFlags* flags) {
-  canvas_->drawImage(image, left, top, ToSkPaint(flags));
-}
-
-void SkiaPaintCanvas::drawImage(const sk_sp<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::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));
 }
 
@@ -273,32 +258,17 @@ void SkiaPaintCanvas::drawPosText(const void* text,
   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 {