diff options
| author | 2016-03-07 17:43:30 +0000 | |
|---|---|---|
| committer | 2016-03-07 17:43:32 +0000 | |
| commit | a98222ae7ad4d5ea33892ed008f5b1b68efedfed (patch) | |
| tree | 19b803a7f85cc9dae37f1573289cd19f29447354 | |
| parent | 75e91294530aea50f8ee8255205429395d728ce5 (diff) | |
| parent | 8913c8942fa15c2df6da747e42c5eda8454758eb (diff) | |
Merge "Reject RenderNodes contents when clip is empty" into nyc-dev
| -rw-r--r-- | libs/hwui/FrameBuilder.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp index 5642170b0ca4..fd5856a1c1de 100644 --- a/libs/hwui/FrameBuilder.cpp +++ b/libs/hwui/FrameBuilder.cpp @@ -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()) { |