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>
This commit is contained in:
Yuqian Li 2017-10-23 12:51:39 -04:00 committed by Skia Commit-Bot
parent 9dd4ae1a7a
commit d99d157d48
2 changed files with 3 additions and 3 deletions

View File

@ -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 {

View File

@ -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)) {