diff options
| author | 2016-01-14 16:15:03 -0800 | |
|---|---|---|
| committer | 2016-03-04 16:28:31 -0800 | |
| commit | 8913c8942fa15c2df6da747e42c5eda8454758eb (patch) | |
| tree | a8b7d9349aa57d53812c0a2313326b436ee30f81 /libs/hwui/FrameBuilder.cpp | |
| parent | 8316fac9c0772b1908d45b2286298b5b791d3ca7 (diff) | |
Reject RenderNodes contents when clip is empty
bug:22630332
Change-Id: I326123de3154f655e35d649c242daea3b4f0fda0
Diffstat (limited to 'libs/hwui/FrameBuilder.cpp')
| -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()) { |