diff options
author | 2014-09-03 17:52:24 -0700 | |
---|---|---|
committer | 2014-09-04 14:05:10 -0700 | |
commit | e83cbd451868a734bfac07ccd680d5617080b579 (patch) | |
tree | eb2c39e190850694b67ad3f6e810a08f63e60282 /libs/hwui/RenderNode.cpp | |
parent | 01abcaa295fc4eec7442a575d160b0ce2c250127 (diff) |
Prioritize reveal clipping over Outline clipping
bug:15780987
bug:17350602
Also update docs around clipping nesting behavior,
and some Z ordering behavior.
Change-Id: Iaa204350a0adfdcbd8c4b821fb4a9c0ae22f2613
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
-rw-r--r-- | libs/hwui/RenderNode.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 72786eb0eecc..7c29f48d62f6 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -405,7 +405,7 @@ void RenderNode::setViewProperties(OpenGLRenderer& renderer, T& handler) { handler(op, PROPERTY_SAVECOUNT, properties().getClipToBounds()); } - // TODO: support both reveal clip and outline clip simultaneously + // TODO: support nesting round rect clips if (mProperties.getRevealClip().willClip()) { Rect bounds; mProperties.getRevealClip().getBounds(&bounds); @@ -413,7 +413,6 @@ void RenderNode::setViewProperties(OpenGLRenderer& renderer, T& handler) { } else if (mProperties.getOutline().willClip()) { renderer.setClippingOutline(handler.allocator(), &(mProperties.getOutline())); } - } /** |