diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-09 15:10:07 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 20:43:41 +0000 |
| commit | 0e8fc8b9e6a138cf4a66b421fb824679df717329 (patch) | |
| tree | 9db412fc2ea22314336f3680249e905c4984902c /src/gpu/GrFixedClip.cpp | |
| parent | 385836d3d764303cc37c4d1bcc0ab890d209374e (diff) | |
Relandx2 "Remove antialiasing control from GrPaint."
Fixes a bad merge.
This reverts commit 073285c0595d46205d1482cc19af2d7d891bfeae.
Change-Id: I5e92339d9b33d3a6dc58b9fcd2a1b3a5684e8f8a
Reviewed-on: https://skia-review.googlesource.com/5774
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrFixedClip.cpp')
| -rw-r--r-- | src/gpu/GrFixedClip.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrFixedClip.cpp b/src/gpu/GrFixedClip.cpp index 79e26624d2..d584ee119e 100644 --- a/src/gpu/GrFixedClip.cpp +++ b/src/gpu/GrFixedClip.cpp @@ -29,7 +29,7 @@ void GrFixedClip::getConservativeBounds(int w, int h, SkIRect* devResult, bool* } } -bool GrFixedClip::isRRect(const SkRect& rtBounds, SkRRect* rr, bool* aa) const { +bool GrFixedClip::isRRect(const SkRect& rtBounds, SkRRect* rr, GrAA* aa) const { if (fWindowRectsState.enabled()) { return false; } @@ -39,7 +39,7 @@ bool GrFixedClip::isRRect(const SkRect& rtBounds, SkRRect* rr, bool* aa) const { return false; } rr->setRect(rect); - *aa = false; + *aa = GrAA::kNo; return true; } return false; |