commit 393981d1db3ffcb5f1c013f5d9ec160fc52b89c4
author Ben Wagner <bungeman@google.com> Tue Apr 16 10:30:57 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 16 17:52:13 2019 +0000
tree 3668e91605bf934f3d4c2d8c0c92ee50a67c0b2f
parent 0e3342cfcd182232b32953fca1c82e9453ee6759

Remove deprecated SkPaintFilterCanvas::onFilter.

No longer used by any clients. The new onFilter is made pure virtual to
enforce that it is implemented and the existing fallback forwarding
implementation is removed.

Change-Id: I8ce522db78d28a1e83779fbfa6979e6e16a0cee5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208507
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

include/utils/SkPaintFilterCanvas.h

diff --git a/include/utils/SkPaintFilterCanvas.h b/include/utils/SkPaintFilterCanvas.h
index d934411..d734af0 100644
--- a/include/utils/SkPaintFilterCanvas.h
+++ b/include/utils/SkPaintFilterCanvas.h
@@ -38,8 +38,6 @@
     }
 
 protected:
-    /** DEPRECATED */
-    virtual bool onFilter(SkTCopyOnFirstWrite<SkPaint>* paint, Type type) const;
     /**
      *  Called with the paint that will be used to draw the specified type.
      *  The implementation may modify the paint as they wish.
@@ -51,7 +49,7 @@
      *        To also filter encapsulated paints (e.g. SkPicture, SkTextBlob), clients may need to
      *        override the relevant methods (i.e. drawPicture, drawTextBlob).
      */
-    virtual bool onFilter(SkPaint& paint) const;
+    virtual bool onFilter(SkPaint& paint) const = 0;
 
     void onDrawPaint(const SkPaint&) override;
     void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;

src/utils/SkPaintFilterCanvas.cpp

diff --git a/src/utils/SkPaintFilterCanvas.cpp b/src/utils/SkPaintFilterCanvas.cpp
index c725c0b..9b9d129 100644
--- a/src/utils/SkPaintFilterCanvas.cpp
+++ b/src/utils/SkPaintFilterCanvas.cpp
@@ -31,20 +31,6 @@
     bool fShouldDraw;
 };
 
-bool SkPaintFilterCanvas::onFilter(SkTCopyOnFirstWrite<SkPaint>* paint, Type type) const {
-    SK_ABORT("Not reached");
-    return false;
-}
-
-bool SkPaintFilterCanvas::onFilter(SkPaint& paint) const {
-    SkTCopyOnFirstWrite<SkPaint> p(paint);
-    bool shouldDraw = this->onFilter(&p, kPicture_Type);
-    if (p.get() != &paint) {
-        paint = *p;
-    }
-    return shouldDraw;
-}
-
 SkPaintFilterCanvas::SkPaintFilterCanvas(SkCanvas *canvas)
     : SkCanvasVirtualEnforcer<SkNWayCanvas>(canvas->imageInfo().width(),
                                               canvas->imageInfo().height()) {