Guard SkCanvas bitmap virtuals for deprecation and removal (flutter#1…

…7371)
knopp · Mar 27, 2020 · 662e780 · 662e780
1 parent 2bb4177
commit 662e780
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/shell/common/canvas_spy.cc b/shell/common/canvas_spy.cc
@@ -124,6 +124,7 @@ void DidDrawCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
   MarkDrawIfNonTransparentPaint(paint);
 }
 
+#if defined(SK_SUPPORT_LEGACY_ONDRAWBITMAP_VIRTUALS)
 void DidDrawCanvas::onDrawBitmap(const SkBitmap& bitmap,
                                  SkScalar x,
                                  SkScalar y,
@@ -138,6 +139,7 @@ void DidDrawCanvas::onDrawBitmapRect(const SkBitmap& bitmap,
                                      SrcRectConstraint constraint) {
   did_draw_ = true;
 }
+#endif
 
 void DidDrawCanvas::onDrawImage(const SkImage* image,
                                 SkScalar left,

diff --git a/shell/common/canvas_spy.h b/shell/common/canvas_spy.h
@@ -127,6 +127,7 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
   // |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
   void onDrawPath(const SkPath&, const SkPaint&) override;
 
+#if defined(SK_SUPPORT_LEGACY_ONDRAWBITMAP_VIRTUALS)
   // |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
   void onDrawBitmap(const SkBitmap&,
                     SkScalar left,
@@ -139,6 +140,7 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
                         const SkRect& dst,
                         const SkPaint*,
                         SrcRectConstraint) override;
+#endif
 
   // |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
   void onDrawImage(const SkImage*,

diff --git a/testing/mock_canvas.cc b/testing/mock_canvas.cc
@@ -225,12 +225,14 @@ void MockCanvas::onDrawRRect(const SkRRect&, const SkPaint&) {
   FML_DCHECK(false);
 }
 
+#if defined(SK_SUPPORT_LEGACY_ONDRAWBITMAP_VIRTUALS)
 void MockCanvas::onDrawBitmap(const SkBitmap&,
                               SkScalar,
                               SkScalar,
                               const SkPaint*) {
   FML_DCHECK(false);
 }
+#endif
 
 void MockCanvas::onDrawImage(const SkImage*,
                              SkScalar,
@@ -239,13 +241,15 @@ void MockCanvas::onDrawImage(const SkImage*,
   FML_DCHECK(false);
 }
 
+#if defined(SK_SUPPORT_LEGACY_ONDRAWBITMAP_VIRTUALS)
 void MockCanvas::onDrawBitmapRect(const SkBitmap&,
                                   const SkRect*,
                                   const SkRect&,
                                   const SkPaint*,
                                   SrcRectConstraint) {
   FML_DCHECK(false);
 }
+#endif
 
 void MockCanvas::onDrawImageRect(const SkImage*,
                                  const SkRect*,

diff --git a/testing/mock_canvas.h b/testing/mock_canvas.h
@@ -195,11 +195,13 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
                  bool,
                  const SkPaint&) override;
   void onDrawRRect(const SkRRect&, const SkPaint&) override;
+#if defined(SK_SUPPORT_LEGACY_ONDRAWBITMAP_VIRTUALS)
   void onDrawBitmapRect(const SkBitmap&,
                         const SkRect*,
                         const SkRect&,
                         const SkPaint*,
                         SrcRectConstraint) override;
+#endif
   void onDrawImage(const SkImage* image,
                    SkScalar x,
                    SkScalar y,
@@ -213,10 +215,12 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
                        const SkIRect&,
                        const SkRect&,
                        const SkPaint*) override;
+#if defined(SK_SUPPORT_LEGACY_ONDRAWBITMAP_VIRTUALS)
   void onDrawBitmap(const SkBitmap& bitmap,
                     SkScalar x,
                     SkScalar y,
                     const SkPaint* paint) override;
+#endif
   void onDrawImageLattice(const SkImage*,
                           const Lattice&,
                           const SkRect&,