Address feedback

Author: MatkovIvan

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/scene/BaseComposeScene.skiko.kt

@@ -38,6 +38,7 @@ import androidx.compose.ui.input.rotary.RotaryScrollEvent
 import androidx.compose.ui.platform.FrameRecomposer
 import androidx.compose.ui.platform.ProvidePlatformCompositionLocals
 import androidx.compose.ui.util.trace
+import kotlin.concurrent.Volatile
 
 /**
  * BaseComposeScene is an internal abstract class that implements the ComposeScene interface.
@@ -82,15 +83,25 @@ internal abstract class BaseComposeScene(
             }
         }
 
+    @Volatile
+    protected var hasForcedLayout: Boolean = false
+        private set
+
+    @Volatile
+    protected var hasForcedDraw: Boolean = false
+        private set
+
     protected fun invokeInvalidationCallbacks(
         forceLayout: Boolean = false,
         forceDraw: Boolean = false,
     ) {
+        hasForcedLayout = hasForcedLayout || forceLayout
+        hasForcedDraw = hasForcedDraw || forceDraw
         if (isInvalidationDisabled || isClosed || composition == null) return
-        if (forceLayout || hasPendingMeasureOrLayout) {
+        if (hasForcedLayout || hasPendingMeasureOrLayout) {
             invalidateLayout()
         }
-        if (forceDraw || hasPendingDraw) {
+        if (hasForcedDraw || hasPendingDraw) {
             invalidateDraw()
         }
     }
@@ -142,6 +153,7 @@ internal abstract class BaseComposeScene(
 
     override fun measureAndLayout() {
         if (isClosed) return
+        hasForcedLayout = false
 
         postponeInvalidation("BaseComposeScene:measureAndLayout") {
             doMeasureAndLayout()
@@ -157,6 +169,7 @@ internal abstract class BaseComposeScene(
 
     override fun draw(canvas: Canvas) {
         if (isClosed) return
+        hasForcedDraw = false
 
         postponeInvalidation("BaseComposeScene:draw") {
             // FIXME: Remove applying the global snapshot here.

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/scene/CanvasLayersComposeScene.skiko.kt

@@ -227,11 +227,11 @@ private class CanvasLayersComposeSceneImpl(
     }
 
     override val hasPendingMeasureOrLayout: Boolean
-        get() = mainOwner.hasPendingMeasureOrLayout
+        get() = hasForcedLayout || mainOwner.hasPendingMeasureOrLayout
             || layers.fastAny { it.owner.hasPendingMeasureOrLayout }
 
     override val hasPendingDraw: Boolean
-        get() = mainOwner.hasPendingDraw
+        get() = hasForcedDraw || mainOwner.hasPendingDraw
             || layers.fastAny { it.owner.hasPendingDraw }
 
     override fun createComposition(
@@ -517,7 +517,7 @@ private class CanvasLayersComposeSceneImpl(
         onOwnerAppended(layer.owner)
 
         inputHandler.onPointerUpdate()
-        invokeInvalidationCallbacks()
+        invokeInvalidationCallbacks(forceLayout = true, forceDraw = true)
     }
 
     private fun detachLayer(layer: AttachedComposeSceneLayer) {
@@ -528,9 +528,9 @@ private class CanvasLayersComposeSceneImpl(
         onOwnerRemoved(layer.owner)
 
         inputHandler.onPointerUpdate()
-        // Removing a layer changes the scene's composited output (e.g. it removes a dialog scrim)
-        // without dirtying any remaining owner, so force a draw pass to repaint without it.
-        invokeInvalidationCallbacks(forceDraw = true)
+        // A detached layer was composited onto this scene's canvas, so its removal changes
+        // the scene's output even though no remaining owner is dirty.
+        invokeInvalidationCallbacks(forceLayout = true, forceDraw = true)
     }
 
     private fun requestFocus(layer: AttachedComposeSceneLayer) {

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/scene/PlatformLayersComposeScene.skiko.kt

@@ -162,10 +162,10 @@ private class PlatformLayersComposeSceneImpl(
     }
 
     override val hasPendingMeasureOrLayout: Boolean
-        get() = mainOwner.hasPendingMeasureOrLayout
+        get() = hasForcedLayout || mainOwner.hasPendingMeasureOrLayout
 
     override val hasPendingDraw: Boolean
-        get() = mainOwner.hasPendingDraw
+        get() = hasForcedDraw || mainOwner.hasPendingDraw
 
     override fun createComposition(
         parentCompositionContext: CompositionContext,

compose/ui/ui/src/skikoTest/kotlin/androidx/compose/ui/scene/CanvasLayersComposeSceneTest.kt

@@ -102,11 +102,14 @@ class CanvasLayersComposeSceneTest {
             // the close below would invalidate simply because an owner was still dirty.
             scene.measureAndLayout()
             scene.draw(surface.canvas.asComposeCanvas())
-            assertFalse(scene.hasInvalidations())
+            assertFalse(scene.hasPendingMeasureOrLayout)
+            assertFalse(scene.hasPendingDraw)
 
             val drawInvalidationsBeforeClose = drawInvalidations
             layer!!.close()
 
+            assertTrue(scene.hasPendingMeasureOrLayout)
+            assertTrue(scene.hasPendingDraw)
             assertTrue(
                 drawInvalidations > drawInvalidationsBeforeClose,
                 "Detaching a layer must request a draw pass to repaint the scene without it",