commit 7d99dad70b97a534a6e23e9c74d914b5eb17ff1e
author Yuqian Li <liyuqian@google.com> Wed Jul 26 13:47:26 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 27 13:51:33 2017 +0000
tree 7081cd1ae966778426509710f0bd9e46c3edb805
parent 41a930f85bc3988cfbb47a902b03a9830f8149bb

Unify DAA and AAA usage decision

Bug: skia:
Change-Id: I2481d872e072fdd638640ef2306aa89c1a1d6d94
Reviewed-on: https://skia-review.googlesource.com/26801
Commit-Queue: Yuqian Li <liyuqian@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>

src/core/SkAAClip.cpp

diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index 100ac9c..092eb69 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -1421,13 +1421,15 @@
     BuilderBlitter blitter(&builder);
 
     if (doAA) {
-        if (!path.isConvex() && gSkUseDeltaAA.load()) {
-            SkScan::DAAFillPath(path, snugClip, &blitter, true);
-        } else if (gSkUseAnalyticAA.load()) {
+#ifdef SK_SUPPORT_LEGACY_DELTA_AA
+        if (gSkUseAnalyticAA.load()) {
             SkScan::AAAFillPath(path, snugClip, &blitter, true);
         } else {
             SkScan::AntiFillPath(path, snugClip, &blitter, true);
         }
+#else
+        SkScan::AntiFillPath(path, snugClip, &blitter, true);
+#endif
     } else {
         SkScan::FillPath(path, snugClip, &blitter);
     }