summaryrefslogtreecommitdiff
path: root/libs/hwui/RenderNode.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2014-05-16 00:37:28 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-05-16 00:37:29 +0000
commitc9ee304c91b5572f0c1cd95e9bd1e4a84e28587d (patch)
treebfa9e5965d749b815ac7e55cea6b7b204db70cca /libs/hwui/RenderNode.cpp
parent6c536eac59adf6e11694ba3800222ad03fe93d1f (diff)
parentdeeda3d337aed1eee218b89a7aba5992ced371f0 (diff)
Merge "Round rect outline clipping"
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
-rw-r--r--libs/hwui/RenderNode.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index d4ff4a39769d..f0645a9eb2ed 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -667,6 +667,10 @@ void RenderNode::issueOperations(OpenGLRenderer& renderer, T& handler) {
bool quickRejected = properties().getClipToBounds()
&& renderer.quickRejectConservative(0, 0, properties().getWidth(), properties().getHeight());
if (!quickRejected) {
+ if (mProperties.getOutline().willClip()) {
+ renderer.setClippingOutline(alloc, &(mProperties.getOutline()));
+ }
+
Vector<ZDrawDisplayListOpPair> zTranslatedNodes;
buildZSortedChildList(zTranslatedNodes);