Fall back from analytic to sampling earlier

src/core/SkScan_AAAPath.cpp

 /*
  * Copyright 2016 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAntiRun.h"
 #include "SkBlitter.h"
 #include "SkEdge.h"
@@ skipping 1112 matching lines @@
     #ifdef SK_DEBUG
     SkDebugf("frac_y_cnt = %d, total_y_cnt = %d\n", frac_y_cnt, total_y_cnt);
     #endif
 }
 
 void SkScan::aaa_fill_path(const SkPath& path, const SkIRect* clipRect, AdditiveBlitter* blitter,
                    int start_y, int stop_y, const SkRegion& clipRgn, bool isUsingMask,
                    bool forceRLE) { // forceRLE implies that SkAAClip is calling us
     SkASSERT(blitter);
 
-    if (path.isInverseFillType() || !path.isConvex()) {
-        // fall back to supersampling AA
-        SkScan::AntiFillPath(path, clipRgn, blitter->getRealBlitter(true), forceRLE);
-        return;
-    }
+    // we only implemented the convex shapes yet
+    SkASSERT(!path.isInverseFillType() && path.isConvex());
 
     SkEdgeBuilder   builder;
 
     // If we're convex, then we need both edges, even the right edge is past the clip
     const bool canCullToTheRight = !path.isConvex();
 
     SkASSERT(gSkUseAnalyticAA.load());
     int count = builder.build(path, clipRect, 0, canCullToTheRight, true);
     SkASSERT(count >= 0);
 
@@ skipping 62 matching lines @@
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkScan::AAAFillPath(const SkPath& path, const SkRegion& origClip, SkBlitter* blitter,
                          bool forceRLE) {
     if (origClip.isEmpty()) {
         return;
     }
+    if (path.isInverseFillType() || !path.isConvex()) {
+        // Fall back as we only implemented the algorithm for convex shapes yet.
+        SkScan::AntiFillPath(path, origClip, blitter, forceRLE);
+        return;
+    }
 
     const bool isInverse = path.isInverseFillType();
     SkIRect ir;
     path.getBounds().roundOut(&ir);
     if (ir.isEmpty()) {
         if (isInverse) {
             blitter->blitRegion(origClip);
         }
         return;
     }
@@ skipping 76 matching lines @@
         AAAFillPath(path, clip.bwRgn(), blitter);
     } else {
         SkRegion        tmp;
         SkAAClipBlitter aaBlitter;
 
         tmp.setRect(clip.getBounds());
         aaBlitter.init(blitter, &clip.aaRgn());
         AAAFillPath(path, tmp, &aaBlitter);
     }
 }