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

2016-03-07 17:43:30 +00:00
parent 75e9129453 8913c8942f
commit a98222ae7a
1 changed files with 3 additions and 2 deletions
--- 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()) {