Replace ComposeScene.calculateContentSize with extension function unconstrainedSize

Author: m-sasha

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.desktop.kt

@@ -345,12 +345,11 @@ internal class ComposeSceneMediator(
         ComposeFeatureFlags.redispatchUnconsumedMouseWheelEvents.value
 
     /**
-     * Provides the size of ComposeScene content inside infinity constraints
+     * Provides the size of the scene content in infinity constraints.
      *
-     * This is needed for the bridge between Compose and Swing since
-     * in some cases, Swing's LayoutManagers need
-     * to calculate the preferred size of the content without max/min constraints
-     * to properly lay it out.
+     * This is needed for the bridge between Compose and Swing since in some cases, Swing's
+     * LayoutManagers need to calculate the preferred size of the content without max/min
+     * constraints to properly lay it out.
      *
      * Example: Compose content inside Popup without a preferred size.
      * Swing will calculate the preferred size of the Compose content and set Popup's side for that.
@@ -359,7 +358,7 @@ internal class ComposeSceneMediator(
      */
     val preferredSize: Dimension
         get() {
-            val contentSize = scene.calculateContentSize()
+            val contentSize = scene.unconstrainedSize()
             val scale = scene.density.density
             return Dimension(
                 (contentSize.width / scale).toInt(),

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/ImageComposeScene.skiko.kt

@@ -37,6 +37,7 @@ import androidx.compose.ui.platform.WindowInfoImpl
 import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.scene.ComposeScene
 import androidx.compose.ui.scene.ComposeScenePointer
+import androidx.compose.ui.scene.unconstrainedSize
 import androidx.compose.ui.semantics.SemanticsOwner
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
@@ -258,7 +259,7 @@ class ImageComposeScene @ExperimentalComposeUiApi constructor(
      */
     @Deprecated("Use calculateContentSize() instead", replaceWith = ReplaceWith("calculateContentSize()"))
     val contentSize: IntSize
-        get() = scene.calculateContentSize()
+        get() = scene.unconstrainedSize()
 
     /**
      * Returns the current content size in infinity constraints.
@@ -268,7 +269,7 @@ class ImageComposeScene @ExperimentalComposeUiApi constructor(
      */
     @ExperimentalComposeUiApi
     fun calculateContentSize(): IntSize {
-        return scene.calculateContentSize()
+        return scene.unconstrainedSize()
     }
 
     /**

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/node/RootNodeOwner.skiko.kt

@@ -245,6 +245,10 @@ internal class RootNodeOwner(
         }
     }
 
+    /**
+     * Provides a way to measure Owner's content in given [constraints]
+     * Draw/pointer and other callbacks won't be called here like in [measureAndLayout] functions
+     */
     fun <T> measuringRootWithConstraints(constraints: Constraints, block: (LayoutNode) -> T): T {
         return try {
             // TODO: is it possible to measure without reassigning root constraints?
@@ -256,21 +260,6 @@ internal class RootNodeOwner(
         }
     }
 
-    /**
-     * Provides a way to measure Owner's content in given [constraints]
-     * Draw/pointer and other callbacks won't be called here like in [measureAndLayout] functions
-     */
-    fun measureInConstraints(constraints: Constraints): IntSize {
-        return measuringRootWithConstraints(constraints) { rootNode ->
-            // Don't use mainOwner.root.width here, as it strictly coerced by [constraints]
-            val children = rootNode.children
-            IntSize(
-                width = children.fastMaxOfOrDefault(0) { it.outerCoordinator.measuredWidth },
-                height = children.fastMaxOfOrDefault(0) { it.outerCoordinator.measuredHeight },
-            )
-        }
-    }
-
     fun measureAndLayout() {
         owner.measureAndLayout(sendPointerUpdate = true)
         updatePositionCacheAndDispatch()

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

@@ -43,7 +43,6 @@ import androidx.compose.ui.node.InternalCoreApi
 import androidx.compose.ui.node.RootNodeOwner
 import androidx.compose.ui.platform.PlatformContext
 import androidx.compose.ui.platform.setContent
-import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
@@ -200,11 +199,6 @@ private class CanvasLayersComposeSceneImpl(
         super.close()
     }
 
-    override fun calculateContentSize(): IntSize {
-        check(!isClosed) { "calculateContentSize called after ComposeScene is closed" }
-        return mainOwner.measureInConstraints(Constraints())
-    }
-
     override val measurableContent: MeasurableRootContent
         get() {
             check(!isClosed) { "measurableSceneContent called after ComposeScene is closed" }

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

@@ -43,6 +43,7 @@ import androidx.compose.ui.node.LayoutNode
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.PlatformContext
 import androidx.compose.ui.platform.PlatformDragAndDropManager
+import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntSize
@@ -133,14 +134,6 @@ sealed interface ComposeScene : AutoCloseable {
      */
     override fun close()
 
-    /**
-     * Returns the current content size (in pixels) in infinity constraints.
-     *
-     * @throws IllegalStateException when [ComposeScene] content has lazy layouts without maximum
-     * size bounds (e.g. LazyColumn without maximum height).
-     */
-    fun calculateContentSize(): IntSize
-
     /**
      * An object through which the composable content of the scene can be queried for its size
      * properties.
@@ -308,4 +301,17 @@ sealed interface ComposeScene : AutoCloseable {
      * Set the visual debug option that shows bounds for all nodes in the hierarchy.
      */
     var showLayoutBounds: Boolean
-}
+}
+
+/**
+ * Returns the current content size (in pixels) in infinity constraints.
+ *
+ * @throws IllegalStateException when [ComposeScene] content has lazy layouts without maximum
+ * size bounds (e.g., LazyColumn without maximum height).
+ */
+@InternalComposeUiApi
+fun ComposeScene.unconstrainedSize(): IntSize {
+    return measurableContent.measuringIn(Constraints()) {
+        IntSize(it.measuredWidth, it.measuredHeight)
+    }
+}

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

@@ -31,7 +31,6 @@ import androidx.compose.ui.node.InternalCoreApi
 import androidx.compose.ui.node.LayoutNode
 import androidx.compose.ui.node.RootNodeOwner
 import androidx.compose.ui.platform.setContent
-import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntSize
@@ -146,11 +145,6 @@ private class PlatformLayersComposeSceneImpl(
         super.close()
     }
 
-    override fun calculateContentSize(): IntSize {
-        check(!isClosed) { "calculateContentSize called after ComposeScene is closed" }
-        return mainOwner.measureInConstraints(Constraints())
-    }
-
     override val measurableContent: MeasurableRootContent
         get() {
             check(!isClosed) { "measurableSceneContent called after ComposeScene is closed" }