commit 9dc0b9e2f86adf9768b9daf2d519a7d1f4d75881
author Mike Reed <reed@google.com> Mon Jul 29 17:52:48 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 30 12:49:28 2019 +0000
tree a5a6f38b23f2ef010ad7c79c1fcd3ee6b7918c40
parent 105c9d507045dc700d0e2f25854e9f86913069ba

remove code now that loopers are dead (w.r.t. canvas and paint)

We can't remove the loopers themselves, as they are still used
by android and chrome (they just don't ever pass them to skia).

Eventually each of those clients will resolve this, but for now
we just keep the classes (and tests) in skia.

Bug: skia:4783
Change-Id: I5f507e6bb82280f2bc7c0b21eebe59c287aa9265
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/230579
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 762af67..8d8e07c 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -8,7 +8,6 @@
 #include "include/core/SkCanvas.h"
 
 #include "include/core/SkColorFilter.h"
-#include "include/core/SkDrawLooper.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkImageFilter.h"
 #include "include/core/SkPathEffect.h"
@@ -110,11 +109,7 @@
               paintStyle == SkPaint::kStrokeAndFill_Style)) {
             return false;
         }
-        if (paint->getMaskFilter()
-#ifdef SK_SUPPORT_LEGACY_DRAWLOOPER
-            || paint->getLooper()
-#endif
-            || paint->getPathEffect() || paint->getImageFilter()) {
+        if (paint->getMaskFilter() || paint->getPathEffect() || paint->getImageFilter()) {
             return false; // conservative
         }
     }
@@ -419,16 +414,7 @@
             // we remove the imagefilter/xfermode inside doNext()
         }
 
-#ifdef SK_SUPPORT_LEGACY_DRAWLOOPER
-        if (SkDrawLooper* looper = paint.getLooper()) {
-            fLooperContext = looper->makeContext(&fAlloc);
-            fCanvas->save();
-            fIsSimple = false;
-        } else
-#endif
         {
-            fLooperContext = nullptr;
-            // can we be marked as simple?
             fIsSimple = !fTempLayerForImageFilter;
         }
     }
@@ -442,9 +428,6 @@
 
     const SkPaint& paint() const {
         SkASSERT(fPaint);
-#ifdef SK_SUPPORT_LEGACY_DRAWLOOPER
-        SkASSERT(fPaint->getDrawLooper() == nullptr);   // we should have cleared this
-#endif
         return *fPaint;
     }
 
@@ -469,8 +452,6 @@
     bool            fTempLayerForImageFilter;
     bool            fDone;
     bool            fIsSimple;
-    SkDrawLooper::Context* fLooperContext;
-    SkSTArenaAlloc<48>     fAlloc;
 
     bool doNext();
 };
@@ -478,36 +459,20 @@
 bool AutoDrawLooper::doNext() {
     fPaint = nullptr;
     SkASSERT(!fIsSimple);
-    SkASSERT(fLooperContext || fTempLayerForImageFilter);
+    SkASSERT(fTempLayerForImageFilter);
 
     SkPaint* paint = fLazyPaintPerLooper.set(fLazyPaintInit.isValid() ?
                                              *fLazyPaintInit.get() : fOrigPaint);
-#ifdef SK_SUPPORT_LEGACY_DRAWLOOPER
-    // never want our downstream clients (i.e. devices) to see loopers
-    paint->setDrawLooper(nullptr);
-#endif
 
     if (fTempLayerForImageFilter) {
         paint->setImageFilter(nullptr);
         paint->setBlendMode(SkBlendMode::kSrcOver);
     }
 
-    if (fLooperContext) {
-        fCanvas->restore();
-        SkDrawLooper::Context::Info info;
-        if (!fLooperContext->next(&info, paint)) {
-            fDone = true;
-            return false;
-        }
-        fCanvas->save();
-        info.applyToCanvas(fCanvas);
-    }
     fPaint = paint;
 
     // if we only came in here for the imagefilter, mark us as done
-    if (!fLooperContext) {
-        fDone = true;
-    }
+    fDone = true;
     return true;
 }
 
@@ -2132,11 +2097,7 @@
 }
 
 static bool needs_autodrawlooper(SkCanvas* canvas, const SkPaint& paint) {
-    return ((intptr_t)paint.getImageFilter()
-#ifdef SK_SUPPORT_LEGACY_DRAWLOOPER
-            | (intptr_t)paint.getLooper()
-#endif
-            ) != 0;
+    return paint.getImageFilter() != nullptr;
 }
 
 void SkCanvas::onDrawRect(const SkRect& r, const SkPaint& paint) {