Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 762e1a17 authored by Chris Craik's avatar Chris Craik Committed by android-build-merger
Browse files

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

am: c27eb736

* commit 'c27eb736':
  Reject RenderNodes contents when clip is empty
parents 9a63b11b c27eb736

libs/hwui/FrameBuilder.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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()) {