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

Commit faa79ff9 authored by Chris Craik's avatar Chris Craik
Browse files

Clip outline to View clip bounds for shadow computation 

bug:18509823

This allows animations of View clipBounds (and other callers of
setClipBounds) to affect shadows, instead of leaving them floating.

Change-Id: I249fa4b371a170cb0c54001f5b0e0097e109b8b8
parent 293f0f38

libs/hwui/RenderNode.cpp

+23 −4
Original line number Diff line number Diff line
@@ -680,13 +680,32 @@ void RenderNode::issueDrawShadowOperation(const Matrix4& transformFromParent, T& 


    float casterAlpha = properties().getAlpha() * properties().getOutline().getAlpha();





    // holds temporary SkPath to store the result of intersections

    SkPath* frameAllocatedPath = NULL;

    const SkPath* outlinePath = casterOutlinePath;



    // intersect the outline with the reveal clip, if present

    if (revealClipPath) {

        // if we can't simply use the caster's path directly, create a temporary one

        SkPath* frameAllocatedPath = handler.allocPathForFrame();

        frameAllocatedPath = handler.allocPathForFrame();



        Op(*outlinePath, *revealClipPath, kIntersect_PathOp, frameAllocatedPath);

        outlinePath = frameAllocatedPath;

    }



    // intersect the outline with the clipBounds, if present

    if (properties().getClippingFlags() & CLIP_TO_CLIP_BOUNDS) {

        if (!frameAllocatedPath) {

            frameAllocatedPath = handler.allocPathForFrame();

        }



        Rect clipBounds;

        properties().getClippingRectForFlags(CLIP_TO_CLIP_BOUNDS, &clipBounds);

        SkPath clipBoundsPath;

        clipBoundsPath.addRect(clipBounds.left, clipBounds.top,

                clipBounds.right, clipBounds.bottom);



        // intersect the outline with the convex reveal clip

        Op(*casterOutlinePath, *revealClipPath, kIntersect_PathOp, frameAllocatedPath);

        Op(*outlinePath, clipBoundsPath, kIntersect_PathOp, frameAllocatedPath);

        outlinePath = frameAllocatedPath;

    }