Canvas: Remove some unused virtuals, and prepare for signature change (…

…flutter#17135) * Canvas: Remove some unused virtuals, and prepare for signature change * Better vertices fix * Add empty placeholders for old signature
renanyoy · Mar 13, 2020 · cf2424b · cf2424b
1 parent 8a6d99f
commit cf2424b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 54 deletions.
diff --git a/shell/common/canvas_spy.cc b/shell/common/canvas_spy.cc
@@ -139,20 +139,6 @@ void DidDrawCanvas::onDrawBitmapRect(const SkBitmap& bitmap,
   did_draw_ = true;
 }
 
-void DidDrawCanvas::onDrawBitmapNine(const SkBitmap& bitmap,
-                                     const SkIRect& center,
-                                     const SkRect& dst,
-                                     const SkPaint* paint) {
-  did_draw_ = true;
-}
-
-void DidDrawCanvas::onDrawBitmapLattice(const SkBitmap& bitmap,
-                                        const Lattice& lattice,
-                                        const SkRect& dst,
-                                        const SkPaint* paint) {
-  did_draw_ = true;
-}
-
 void DidDrawCanvas::onDrawImage(const SkImage* image,
                                 SkScalar left,
                                 SkScalar top,
@@ -201,8 +187,6 @@ void DidDrawCanvas::onDrawDrawable(SkDrawable* drawable,
 }
 
 void DidDrawCanvas::onDrawVerticesObject(const SkVertices* vertices,
-                                         const SkVertices::Bone bones[],
-                                         int boneCount,
                                          SkBlendMode bmode,
                                          const SkPaint& paint) {
   MarkDrawIfNonTransparentPaint(paint);

diff --git a/shell/common/canvas_spy.h b/shell/common/canvas_spy.h
@@ -153,12 +153,6 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
                        const SkPaint*,
                        SrcRectConstraint) override;
 
-  // |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
-  void onDrawBitmapLattice(const SkBitmap&,
-                           const Lattice&,
-                           const SkRect&,
-                           const SkPaint*) override;
-
   // |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
   void onDrawImageLattice(const SkImage*,
                           const Lattice&,
@@ -172,15 +166,14 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
                        const SkPaint*) override;
 
   // |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
-  void onDrawBitmapNine(const SkBitmap&,
-                        const SkIRect& center,
-                        const SkRect& dst,
-                        const SkPaint*) override;
-
-  // |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
+#ifdef SK_SUPPORT_LEGACY_DRAWVERTS_VIRTUAL
+  void onDrawVerticesObject(const SkVertices*,
+                            const SkVertices::Bone[],
+                            int,
+                            SkBlendMode,
+                            const SkPaint&) override {}
+#endif
   void onDrawVerticesObject(const SkVertices*,
-                            const SkVertices::Bone bones[],
-                            int boneCount,
                             SkBlendMode,
                             const SkPaint&) override;
 

diff --git a/testing/mock_canvas.cc b/testing/mock_canvas.cc
@@ -262,30 +262,14 @@ void MockCanvas::onDrawImageNine(const SkImage*,
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawBitmapNine(const SkBitmap&,
-                                  const SkIRect&,
-                                  const SkRect&,
-                                  const SkPaint*) {
-  FML_DCHECK(false);
-}
-
 void MockCanvas::onDrawImageLattice(const SkImage*,
                                     const Lattice&,
                                     const SkRect&,
                                     const SkPaint*) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawBitmapLattice(const SkBitmap&,
-                                     const Lattice&,
-                                     const SkRect&,
-                                     const SkPaint*) {
-  FML_DCHECK(false);
-}
-
 void MockCanvas::onDrawVerticesObject(const SkVertices*,
-                                      const SkVertices::Bone[],
-                                      int,
                                       SkBlendMode,
                                       const SkPaint&) {
   FML_DCHECK(false);

diff --git a/testing/mock_canvas.h b/testing/mock_canvas.h
@@ -217,21 +217,18 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
                     SkScalar x,
                     SkScalar y,
                     const SkPaint* paint) override;
-  void onDrawBitmapNine(const SkBitmap&,
-                        const SkIRect&,
-                        const SkRect&,
-                        const SkPaint*) override;
   void onDrawImageLattice(const SkImage*,
                           const Lattice&,
                           const SkRect&,
                           const SkPaint*) override;
-  void onDrawBitmapLattice(const SkBitmap&,
-                           const Lattice&,
-                           const SkRect&,
-                           const SkPaint*) override;
+#ifdef SK_SUPPORT_LEGACY_DRAWVERTS_VIRTUAL
   void onDrawVerticesObject(const SkVertices*,
                             const SkVertices::Bone[],
                             int,
+                            SkBlendMode,
+                            const SkPaint&) override {}
+#endif
+  void onDrawVerticesObject(const SkVertices*,
                             SkBlendMode,
                             const SkPaint&) override;
   void onDrawAtlas(const SkImage*,