diff options
| author |  Yuqian Li <liyuqian@google.com> | 2017-11-02 15:10:16 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-02 19:31:02 +0000 |
| commit | 9e43934a7270c413088c77f16fee727b40395471 (patch) | |
| tree | 9ed45930046e067c689e9fb835110b702d05bf2e | |
| parent | ab246cb58ddc883d4e2b88889419dd38e580416c (diff) | |
Remove SK_SUPPORT_LEGACY_AA_CHOICE
Bug: skia:
Change-Id: If754225685699c1d1e8e516fb2a4671da2d13572
Reviewed-on: https://skia-review.googlesource.com/67260
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Yuqian Li <liyuqian@google.com>
| -rw-r--r-- | src/core/SkAAClip.cpp | 8 | ||||
| -rw-r--r-- | src/core/SkScan_AntiPath.cpp | 12 |
2 files changed, 0 insertions, 20 deletions
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp index 4e3eb162e7..d4db8ee31e 100644 --- a/src/core/SkAAClip.cpp +++ b/src/core/SkAAClip.cpp @@ -1420,15 +1420,7 @@ bool SkAAClip::setPath(const SkPath& path, const SkRegion* clip, bool doAA) { BuilderBlitter blitter(&builder); if (doAA) { -#ifdef SK_SUPPORT_LEGACY_AA_CHOICE - 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); } diff --git a/src/core/SkScan_AntiPath.cpp b/src/core/SkScan_AntiPath.cpp index 65bcb7cfe6..ba42a72d17 100644 --- a/src/core/SkScan_AntiPath.cpp +++ b/src/core/SkScan_AntiPath.cpp @@ -615,7 +615,6 @@ static bool ShouldUseAAA(const SkPath& path) { void SkScan::AntiFillPath(const SkPath& path, const SkRegion& origClip, SkBlitter* blitter, bool forceRLE) { -#if !defined(SK_SUPPORT_LEGACY_AA_CHOICE) if (ShouldUseDAA(path)) { SkScan::DAAFillPath(path, origClip, blitter, forceRLE); return; @@ -625,7 +624,6 @@ void SkScan::AntiFillPath(const SkPath& path, const SkRegion& origClip, SkScan::AAAFillPath(path, origClip, blitter, forceRLE); return; } -#endif FillPathFunc fillPathFunc = [](const SkPath& path, SkBlitter* blitter, bool isInverse, const SkIRect& ir, const SkIRect& clipBounds, bool containedInClip, bool forceRLE){ @@ -675,16 +673,6 @@ void SkScan::AntiFillPath(const SkPath& path, const SkRasterClip& clip, using FillPathProc = void(*)(const SkPath&, const SkRegion&, SkBlitter*, bool); FillPathProc fillPathProc = &SkScan::AntiFillPath; -#ifdef SK_SUPPORT_LEGACY_AA_CHOICE - if (ShouldUseDAA(path)) { - fillPathProc = &SkScan::DAAFillPath; - } else if (ShouldUseAAA(path)) { - // Do not use AAA if path is too complicated: - // there won't be any speedup or significant visual improvement. - fillPathProc = &SkScan::AAAFillPath; - } -#endif - if (clip.isBW()) { fillPathProc(path, clip.bwRgn(), blitter, false); } else { |