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.h | |
| 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.h')
| -rw-r--r-- | src/gpu/GrFixedClip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrFixedClip.h b/src/gpu/GrFixedClip.h index 6c350d5cba..7f18c2667f 100644 --- a/src/gpu/GrFixedClip.h +++ b/src/gpu/GrFixedClip.h @@ -42,7 +42,7 @@ public: bool quickContains(const SkRect&) const override; void getConservativeBounds(int w, int h, SkIRect* devResult, bool* iior) const override; - bool isRRect(const SkRect& rtBounds, SkRRect* rr, bool* aa) const override; + bool isRRect(const SkRect& rtBounds, SkRRect* rr, GrAA*) const override; bool apply(GrContext*, GrRenderTargetContext*, bool, bool, GrAppliedClip* out) const override; static const GrFixedClip& Disabled(); |