diff options
| author | 2016-02-04 19:08:59 +0000 | |
|---|---|---|
| committer | 2016-02-04 19:08:59 +0000 | |
| commit | 37fd29f2842c4b92ba3ddbba2f9a5024ce103783 (patch) | |
| tree | 9d6540a664b974f36961ddd0eff8802681779b38 /libs/hwui/FrameBuilder.cpp | |
| parent | c8ca8ceba067e5f439560275fd9529646f2b569a (diff) | |
| parent | 7fc1b0349bc2ac8c880120dc5611f703faa7f06f (diff) | |
Merge "Fix ripple clipping + quick rejection"
Diffstat (limited to 'libs/hwui/FrameBuilder.cpp')
| -rw-r--r-- | libs/hwui/FrameBuilder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp index 57e5b9d8735a..185accec1ef6 100644 --- a/libs/hwui/FrameBuilder.cpp +++ b/libs/hwui/FrameBuilder.cpp @@ -203,7 +203,9 @@ void FrameBuilder::deferNodePropsAndOps(RenderNode& node) { mCanvasState.setClippingOutline(mAllocator, &(properties.getOutline())); } - if (!mCanvasState.quickRejectConservative(0, 0, width, height)) { + bool quickRejected = 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()) { // HW layer |