Finish removing deprecated SkCanvas virtuals (#17445)
API staging is complete - these defines have been removed.
diff --git a/shell/common/canvas_spy.cc b/shell/common/canvas_spy.cc
index 2cdb71f..5b62a34 100644
--- a/shell/common/canvas_spy.cc
+++ b/shell/common/canvas_spy.cc
@@ -124,23 +124,6 @@
MarkDrawIfNonTransparentPaint(paint);
}
-#if defined(SK_SUPPORT_LEGACY_ONDRAWBITMAP_VIRTUALS)
-void DidDrawCanvas::onDrawBitmap(const SkBitmap& bitmap,
- SkScalar x,
- SkScalar y,
- const SkPaint* paint) {
- did_draw_ = true;
-}
-
-void DidDrawCanvas::onDrawBitmapRect(const SkBitmap& bitmap,
- const SkRect* src,
- const SkRect& dst,
- const SkPaint* paint,
- SrcRectConstraint constraint) {
- did_draw_ = true;
-}
-#endif
-
void DidDrawCanvas::onDrawImage(const SkImage* image,
SkScalar left,
SkScalar top,
diff --git a/shell/common/canvas_spy.h b/shell/common/canvas_spy.h
index 4aab238..d5c75be 100644
--- a/shell/common/canvas_spy.h
+++ b/shell/common/canvas_spy.h
@@ -127,21 +127,6 @@
// |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
void onDrawPath(const SkPath&, const SkPaint&) override;
-#if defined(SK_SUPPORT_LEGACY_ONDRAWBITMAP_VIRTUALS)
- // |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
- void onDrawBitmap(const SkBitmap&,
- SkScalar left,
- SkScalar top,
- const SkPaint*) override;
-
- // |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
- void onDrawBitmapRect(const SkBitmap&,
- const SkRect* src,
- const SkRect& dst,
- const SkPaint*,
- SrcRectConstraint) override;
-#endif
-
// |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
void onDrawImage(const SkImage*,
SkScalar left,
@@ -168,13 +153,6 @@
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*,
SkBlendMode,
const SkPaint&) override;
diff --git a/testing/mock_canvas.cc b/testing/mock_canvas.cc
index 88ab5f9..300f2d4 100644
--- a/testing/mock_canvas.cc
+++ b/testing/mock_canvas.cc
@@ -225,15 +225,6 @@
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,
SkScalar,
@@ -241,16 +232,6 @@
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*,
const SkRect&,
diff --git a/testing/mock_canvas.h b/testing/mock_canvas.h
index e7438db..2957783 100644
--- a/testing/mock_canvas.h
+++ b/testing/mock_canvas.h
@@ -195,13 +195,6 @@
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,
@@ -215,23 +208,10 @@
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&,
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;
