diff options
| author |  Yuqian Li <liyuqian@google.com> | 2018-05-03 11:28:28 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-03 18:48:32 +0000 |
| commit | 737b9a9d4806e376ee960d22578d08ea088c6ccd (patch) | |
| tree | ddf8a76576a053f803e9371617ee86298414a323 /src/core/SkScan_AAAPath.cpp | |
| parent | 884bce709a73bc19f9e347324cebe3dad3a9701a (diff) | |
Remove legacy guard flags
Bug: skia:
Change-Id: I3b526f2caec6766faea72cdc89550f50e17c71d2
Reviewed-on: https://skia-review.googlesource.com/125746
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Yuqian Li <liyuqian@google.com>
Diffstat (limited to 'src/core/SkScan_AAAPath.cpp')
| -rw-r--r-- | src/core/SkScan_AAAPath.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/core/SkScan_AAAPath.cpp b/src/core/SkScan_AAAPath.cpp index 3d78525d31..5e7f232ff7 100644 --- a/src/core/SkScan_AAAPath.cpp +++ b/src/core/SkScan_AAAPath.cpp @@ -1287,12 +1287,7 @@ static inline bool edges_too_close(SkAnalyticEdge* prev, SkAnalyticEdge* next, S // even if prev->fX and next->fX are close and within one pixel (e.g., prev->fX == 0.1, // next->fX == 0.9). Adding SLACK = 1 to the formula would guarantee it to be true if two // edges prev and next are within one pixel. - constexpr SkFixed SLACK = -#ifdef SK_SUPPORT_LEGACY_AA_BEHAVIOR - 0; -#else - SK_Fixed1; -#endif + constexpr SkFixed SLACK = SK_Fixed1; // Note that even if the following test failed, the edges might still be very close to each // other at some point within the current pixel row because of prev->fDX and next->fDX. @@ -1480,17 +1475,10 @@ static void aaa_walk_edges(SkAnalyticEdge* prevHead, SkAnalyticEdge* nextTail, } else { SkFixed rite = currE->fX; currE->goY(nextY, yShift); -#ifdef SK_SUPPORT_LEGACY_DELTA_AA - leftE->fX = SkTMax(leftClip, leftE->fX); - rite = SkTMin(rightClip, rite); - currE->fX = SkTMin(rightClip, currE->fX); - blit_trapezoid_row(blitter, y >> 16, left, rite, leftE->fX, currE->fX, -#else SkFixed nextLeft = SkTMax(leftClip, leftE->fX); rite = SkTMin(rightClip, rite); SkFixed nextRite = SkTMin(rightClip, currE->fX); blit_trapezoid_row(blitter, y >> 16, left, rite, nextLeft, nextRite, -#endif leftDY, currE->fDY, fullAlpha, maskRow, isUsingMask, noRealBlitter || (fullAlpha == 0xFF && ( edges_too_close(prevRite, left, leftE->fX) || |