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

Commit bad60b8d authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix clip calculation for disabled clip bounds" into main

parents 9ef8c1f7 8505f344

libs/hwui/jni/android_graphics_RenderNode.cpp

+7 −1
Original line number Diff line number Diff line
@@ -597,7 +597,13 @@ static void android_view_RenderNode_requestPositionUpdates(JNIEnv* env, jobject, 
            SkIRect clipBounds;

            if (enableClip) {

                uirenderer::Rect initialClipBounds;

                props.getClippingRectForFlags(props.getClippingFlags(), &initialClipBounds);

                const auto clipFlags = props.getClippingFlags();

                if (clipFlags) {

                    props.getClippingRectForFlags(clipFlags, &initialClipBounds);

                } else {

                    // Works for RenderNode::damageSelf()

                    initialClipBounds.set(DIRTY_MIN, DIRTY_MIN, DIRTY_MAX, DIRTY_MAX);

                }

                clipBounds =

                        info.damageAccumulator

                                ->computeClipAndTransform(initialClipBounds.toSkRect(), &transform)