Clean up cc/paint interfaces

cc/paint/paint_canvas.h

 // 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.
 
 #ifndef CC_PAINT_PAINT_CANVAS_H_
 #define CC_PAINT_PAINT_CANVAS_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "build/build_config.h"
@@ skipping 35 matching lines @@
   virtual int save() = 0;
   virtual int saveLayer(const SkRect* bounds, const PaintFlags* flags) = 0;
   virtual int saveLayerAlpha(const SkRect* bounds, U8CPU alpha) = 0;
 
   virtual void restore() = 0;
   virtual int getSaveCount() const = 0;
   virtual void restoreToCount(int save_count) = 0;
   virtual void translate(SkScalar dx, SkScalar dy) = 0;
   virtual void scale(SkScalar sx, SkScalar sy) = 0;
   virtual void rotate(SkScalar degrees) = 0;
-  virtual void rotate(SkScalar degrees, SkScalar px, SkScalar py) = 0;
   virtual void concat(const SkMatrix& matrix) = 0;
   virtual void setMatrix(const SkMatrix& matrix) = 0;
-  virtual void resetMatrix() = 0;
 
   virtual void clipRect(const SkRect& rect,
                         SkClipOp op,
                         bool do_anti_alias) = 0;
   void clipRect(const SkRect& rect, SkClipOp op) { clipRect(rect, op, false); }
   void clipRect(const SkRect& rect, bool do_anti_alias) {
     clipRect(rect, SkClipOp::kIntersect, do_anti_alias);
   }
   void clipRect(const SkRect& rect) {
     clipRect(rect, SkClipOp::kIntersect, false);
@@ skipping 49 matching lines @@
   virtual void drawArc(const SkRect& oval,
                        SkScalar start_angle,
                        SkScalar sweep_angle,
                        bool use_center,
                        const PaintFlags& flags) = 0;
   virtual void drawRoundRect(const SkRect& rect,
                              SkScalar rx,
                              SkScalar ry,
                              const PaintFlags& flags) = 0;
   virtual void drawPath(const SkPath& path, const PaintFlags& flags) = 0;
-  virtual void drawImage(const SkImage* image,
+  virtual void drawImage(sk_sp<const SkImage> image,
                          SkScalar left,
                          SkScalar top,
                          const PaintFlags* flags) = 0;
-  void drawImage(const SkImage* image, SkScalar left, SkScalar top) {
-    drawImage(image, left, top, nullptr);
-  }
-  virtual void drawImage(const sk_sp<SkImage>& image,
-                         SkScalar left,
-                         SkScalar top,
-                         const PaintFlags* flags) = 0;
-  void drawImage(const sk_sp<SkImage>& image, SkScalar left, SkScalar top) {
+  void drawImage(sk_sp<const SkImage> image, SkScalar left, SkScalar top) {
     drawImage(image, left, top, nullptr);
   }
 
   enum SrcRectConstraint {
     kStrict_SrcRectConstraint = SkCanvas::kStrict_SrcRectConstraint,
     kFast_SrcRectConstraint = SkCanvas::kFast_SrcRectConstraint,
   };
 
-  virtual void drawImageRect(const SkImage* image,
+  virtual void drawImageRect(sk_sp<const SkImage> image,
                              const SkRect& src,
                              const SkRect& dst,
                              const PaintFlags* flags,
                              SrcRectConstraint constraint) = 0;
   virtual void drawBitmap(const SkBitmap& bitmap,
                           SkScalar left,
                           SkScalar top,
                           const PaintFlags* flags) = 0;
   void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top) {
     drawBitmap(bitmap, left, top, nullptr);
   }
 
   virtual void drawText(const void* text,
                         size_t byte_length,
                         SkScalar x,
                         SkScalar y,
                         const PaintFlags& flags) = 0;
   virtual void drawPosText(const void* text,
                            size_t byte_length,
                            const SkPoint pos[],
                            const PaintFlags& flags) = 0;
-  virtual void drawTextBlob(const SkTextBlob* blob,
-                            SkScalar x,
-                            SkScalar y,
-                            const PaintFlags& flags) = 0;
-  virtual void drawTextBlob(const sk_sp<SkTextBlob>& blob,
+  virtual void drawTextBlob(sk_sp<SkTextBlob> blob,
                             SkScalar x,
                             SkScalar y,
                             const PaintFlags& flags) = 0;
 
-  virtual void drawPicture(const PaintRecord* record) = 0;
-  virtual void drawPicture(const PaintRecord* record,
+  virtual void drawPicture(sk_sp<const PaintRecord> record,
                            const SkMatrix* matrix,
                            const PaintFlags* flags) = 0;
-  virtual void drawPicture(sk_sp<PaintRecord> record) = 0;
+  void drawPicture(sk_sp<const PaintRecord> record) {
+    drawPicture(record, nullptr, nullptr);
+  }
 
   virtual bool isClipEmpty() const = 0;
   virtual bool isClipRect() const = 0;
   virtual const SkMatrix& getTotalMatrix() const = 0;
 
   // For GraphicsContextCanvas only.  Maybe this could be rewritten?
   virtual void temporary_internal_describeTopLayer(SkMatrix* matrix,
                                                    SkIRect* clip_bounds) = 0;
 
   virtual bool ToPixmap(SkPixmap* output) = 0;
@@ skipping 71 matching lines @@
                                                          const SkPoint& point,
                                                          SkData* data);
 
 CC_PAINT_EXPORT void PaintCanvasAnnotateLinkToDestination(PaintCanvas* canvas,
                                                           const SkRect& rect,
                                                           SkData* data);
 
 }  // namespace cc
 
 #endif  // CC_PAINT_PAINT_CANVAS_H_