commit 8505f344ee40c04b55ed129afc58c657a98b2616
author John Reck <jreck@google.com> Mon Nov 13 14:24:35 2023 -0500
committer John Reck <jreck@google.com> Mon Nov 13 14:38:45 2023 -0500
tree d05a0bdc954b0eb480d9ae68c2ad239e76e451c0
parent c64add5fbce5a1211b77d0cc7cc2e3969f402f03

Fix clip calculation for disabled clip bounds

Fixes: 309635621
Test: atest android.uirendering.cts.testclasses.SurfaceViewTests
Change-Id: Ie38c491c5a87f19b5352774164187e713bdf5849

libs/hwui/jni/android_graphics_RenderNode.cpp

diff --git a/libs/hwui/jni/android_graphics_RenderNode.cpp b/libs/hwui/jni/android_graphics_RenderNode.cpp
index a1b05c1..a7d6423 100644
--- a/libs/hwui/jni/android_graphics_RenderNode.cpp
+++ b/libs/hwui/jni/android_graphics_RenderNode.cpp
@@ -597,7 +597,13 @@
             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)