Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reject RenderNodes contents when clip is empty" into nyc-dev

Browse Source 
am: a98222ae7a

* commit 'a98222ae7ad4d5ea33892ed008f5b1b68efedfed':
  Reject RenderNodes contents when clip is empty
This commit is contained in:
Chris Craik
2016-03-07 19:26:05 +00:00
committed by android-build-merger
parent ef29bce113 a98222ae7a
commit c27eb736a9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/hwui/FrameBuilder.cpp
View File

@@ -203,8 +203,9 @@ void FrameBuilder::deferNodePropsAndOps(RenderNode& node) {
mCanvasState.setClippingOutline(mAllocator, &(properties.getOutline()));
}
bool quickRejected = properties.getClipToBounds()
&& mCanvasState.quickRejectConservative(0, 0, width, height);
bool quickRejected = mCanvasState.currentSnapshot()->getRenderTargetClip().isEmpty()
|| (properties.getClipToBounds()
&& mCanvasState.quickRejectConservative(0, 0, width, height));
if (!quickRejected) {
// not rejected, so defer render as either Layer, or direct (possibly wrapped in saveLayer)
if (node.getLayer()) {