diff options
| author |  Yuqian Li <liyuqian@google.com> | 2017-10-23 12:51:39 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-23 17:13:49 +0000 |
| commit | d99d157d48b2c70d365d15b67049a7c2d8d714f7 (patch) | |
| tree | 54720407064916cf0f2ebdb25a286e406669f1d1 /src | |
| parent | 9dd4ae1a7a1c188267af3e05ec5408ae6fe22326 (diff) | |
Use SK_SUPPORT_LEGACY_AA_CHOICE to stage some changes
So I can rebaseline the golden images and unify AA choices without
fully turning on DAA.
Bug: skia:
Change-Id: I33447f60c8eac6318dda7730abd6caefdb14c5dc
Reviewed-on: https://skia-review.googlesource.com/62840
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Yuqian Li <liyuqian@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkAAClip.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkScan_AntiPath.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp index c1a39ed0e4..4e3eb162e7 100644 --- a/src/core/SkAAClip.cpp +++ b/src/core/SkAAClip.cpp @@ -1420,7 +1420,7 @@ bool SkAAClip::setPath(const SkPath& path, const SkRegion* clip, bool doAA) { BuilderBlitter blitter(&builder); if (doAA) { -#ifdef SK_SUPPORT_LEGACY_DELTA_AA +#ifdef SK_SUPPORT_LEGACY_AA_CHOICE if (gSkUseAnalyticAA.load()) { SkScan::AAAFillPath(path, snugClip, &blitter, true); } else { diff --git a/src/core/SkScan_AntiPath.cpp b/src/core/SkScan_AntiPath.cpp index 86b4355bc9..65bcb7cfe6 100644 --- a/src/core/SkScan_AntiPath.cpp +++ b/src/core/SkScan_AntiPath.cpp @@ -615,7 +615,7 @@ static bool ShouldUseAAA(const SkPath& path) { void SkScan::AntiFillPath(const SkPath& path, const SkRegion& origClip, SkBlitter* blitter, bool forceRLE) { -#if !defined(SK_SUPPORT_LEGACY_DELTA_AA) +#if !defined(SK_SUPPORT_LEGACY_AA_CHOICE) if (ShouldUseDAA(path)) { SkScan::DAAFillPath(path, origClip, blitter, forceRLE); return; @@ -675,7 +675,7 @@ 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_DELTA_AA +#ifdef SK_SUPPORT_LEGACY_AA_CHOICE if (ShouldUseDAA(path)) { fillPathProc = &SkScan::DAAFillPath; } else if (ShouldUseAAA(path)) { |