Clean up cc/paint interfaces

cc/paint/skia_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_SKIA_PAINT_CANVAS_H_
 #define CC_PAINT_SKIA_PAINT_CANVAS_H_
 
 #include <memory>
 
 #include "base/compiler_specific.h"
@@ skipping 41 matching lines @@
   int save() override;
   int saveLayer(const SkRect* bounds, const PaintFlags* flags) override;
   int saveLayerAlpha(const SkRect* bounds, U8CPU alpha) override;
 
   void restore() override;
   int getSaveCount() const override;
   void restoreToCount(int save_count) override;
   void translate(SkScalar dx, SkScalar dy) override;
   void scale(SkScalar sx, SkScalar sy) override;
   void rotate(SkScalar degrees) override;
-  void rotate(SkScalar degrees, SkScalar px, SkScalar py) override;
   void concat(const SkMatrix& matrix) override;
   void setMatrix(const SkMatrix& matrix) override;
-  void resetMatrix() override;
 
   void clipRect(const SkRect& rect, SkClipOp op, bool do_anti_alias) override;
   void clipRRect(const SkRRect& rrect,
                  SkClipOp op,
                  bool do_anti_alias) override;
   void clipPath(const SkPath& path, SkClipOp op, bool do_anti_alias) override;
   bool quickReject(const SkRect& rect) const override;
   bool quickReject(const SkPath& path) const override;
   SkRect getLocalClipBounds() const override;
   bool getLocalClipBounds(SkRect* bounds) const override;
@@ skipping 21 matching lines @@
   void drawArc(const SkRect& oval,
                SkScalar start_angle,
                SkScalar sweep_angle,
                bool use_center,
                const PaintFlags& flags) override;
   void drawRoundRect(const SkRect& rect,
                      SkScalar rx,
                      SkScalar ry,
                      const PaintFlags& flags) override;
   void drawPath(const SkPath& path, const PaintFlags& flags) override;
-  void drawImage(const SkImage* image,
+  void drawImage(sk_sp<const SkImage> image,
                  SkScalar left,
                  SkScalar top,
                  const PaintFlags* flags) override;
-  void drawImage(const sk_sp<SkImage>& image,
-                 SkScalar left,
-                 SkScalar top,
-                 const PaintFlags* flags) override;
-
-  void drawImageRect(const SkImage* image,
+  void drawImageRect(sk_sp<const SkImage> image,
                      const SkRect& src,
                      const SkRect& dst,
                      const PaintFlags* flags,
                      SrcRectConstraint constraint) override;
   void drawBitmap(const SkBitmap& bitmap,
                   SkScalar left,
                   SkScalar top,
                   const PaintFlags* flags) override;
 
   void drawText(const void* text,
                 size_t byte_length,
                 SkScalar x,
                 SkScalar y,
                 const PaintFlags& flags) override;
   void drawPosText(const void* text,
                    size_t byte_length,
                    const SkPoint pos[],
                    const PaintFlags& flags) override;
-  void drawTextBlob(const SkTextBlob* blob,
-                    SkScalar x,
-                    SkScalar y,
-                    const PaintFlags& flags) override;
-  void drawTextBlob(const sk_sp<SkTextBlob>& blob,
+  void drawTextBlob(sk_sp<SkTextBlob> blob,
                     SkScalar x,
                     SkScalar y,
                     const PaintFlags& flags) override;
 
-  void drawPicture(const PaintRecord* record) override;
-  void drawPicture(const PaintRecord* record,
+  void drawPicture(sk_sp<const PaintRecord> record,
                    const SkMatrix* matrix,
                    const PaintFlags* flags) override;
-  void drawPicture(sk_sp<PaintRecord> record) override;
 
   bool isClipEmpty() const override;
   bool isClipRect() const override;
   const SkMatrix& getTotalMatrix() const override;
 
   void temporary_internal_describeTopLayer(SkMatrix* matrix,
                                            SkIRect* clip_bounds) override;
 
   bool ToPixmap(SkPixmap* output) override;
   void AnnotateRectWithURL(const SkRect& rect, SkData* data) override;
   void AnnotateNamedDestination(const SkPoint& point, SkData* data) override;
   void AnnotateLinkToDestination(const SkRect& rect, SkData* data) override;
 
   // Don't shadow non-virtual helper functions.
   using PaintCanvas::clipRect;
   using PaintCanvas::clipRRect;
   using PaintCanvas::clipPath;
   using PaintCanvas::drawBitmap;
   using PaintCanvas::drawColor;
   using PaintCanvas::drawImage;
+  using PaintCanvas::drawPicture;
 
  private:
   SkCanvas* canvas_;
   std::unique_ptr<SkCanvas> owned_;
 };
 
 }  // namespace cc
 
 #endif  // CC_PAINT_SKIA_PAINT_CANVAS_H_