aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrFixedClip.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2016-12-08 16:57:38 +0000
committerGravatar Brian Salomon <bsalomon@google.com>2016-12-08 17:11:46 +0000
commit419d81eed4a010e6080db199795117cbedf9e6e4 (patch)
tree7e11b85514db3fe6c7c7f43f8c07d2839eda7bed /src/gpu/GrFixedClip.cpp
parenta92c383e2f1ceb0323aef79fa444450e6a3e1c03 (diff)
Revert "Remove antialiasing control from GrPaint."
This reverts commit 9f549358b3ac9f61e78b194e39d6ac6eb322e35e. Reason for revert: hitting asserts Change-Id: I542d34edc05ecf72b7646263f25736a0950c78e7 Reviewed-on: https://skia-review.googlesource.com/5707 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrFixedClip.cpp')
-rw-r--r--src/gpu/GrFixedClip.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrFixedClip.cpp b/src/gpu/GrFixedClip.cpp
index f664a54b74..9e87588a5d 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, GrAA* aa) const {
+bool GrFixedClip::isRRect(const SkRect& rtBounds, SkRRect* rr, bool* aa) const {
if (fWindowRectsState.enabled()) {
return false;
}
@@ -39,7 +39,7 @@ bool GrFixedClip::isRRect(const SkRect& rtBounds, SkRRect* rr, GrAA* aa) const {
return false;
}
rr->setRect(rect);
- *aa = GrAA::kNo;
+ *aa = false;
return true;
}
return false;