summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Derek Sollenberger <djsollen@google.com> 2017-04-18 16:06:35 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-04-18 16:06:41 +0000
commit190fe086df0c3a054e09dafc6fe459b929af0756 (patch)
tree336dac77e027f6d1593861ec7be45748a0a041d1
parent2b499e4eba123baeb1ed7ba884c842623970ebd4 (diff)
parentf7d98f436cf1351cb479e0abd6af7056553a6fa9 (diff)
Merge "Remove round rect clipping optimization." into oc-dev
-rw-r--r--libs/hwui/SkiaCanvas.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp
index d95acff8a38e..3e5e3bfc3bf2 100644
--- a/libs/hwui/SkiaCanvas.cpp
+++ b/libs/hwui/SkiaCanvas.cpp
@@ -390,14 +390,8 @@ bool SkiaCanvas::clipRect(float left, float top, float right, float bottom, SkCl
}
bool SkiaCanvas::clipPath(const SkPath* path, SkClipOp op) {
- SkRRect roundRect;
- if (path->isRRect(&roundRect)) {
- this->recordClip(roundRect, op);
- mCanvas->clipRRect(roundRect, op);
- } else {
- this->recordClip(*path, op);
- mCanvas->clipPath(*path, op);
- }
+ this->recordClip(*path, op);
+ mCanvas->clipPath(*path, op);
return !mCanvas->isClipEmpty();
}