Better ComposeScene naming

compose/foundation/foundation/src/skikoTest/kotlin/androidx/compose/foundation/OnClickTest.kt

@@ -20,7 +20,6 @@ import androidx.compose.foundation.gestures.detectTransformGestures
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.size
-import androidx.compose.ui.ComposeScene
 import androidx.compose.ui.ImageComposeScene
 import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -33,10 +32,11 @@ import androidx.compose.ui.input.pointer.isAltPressed
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalViewConfiguration
 import androidx.compose.ui.platform.ViewConfiguration
+import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.runSkikoComposeUiTest
-import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.use
 import kotlin.test.Test
@@ -82,9 +82,9 @@ class OnClickTest {
     @OptIn(ExperimentalFoundationApi::class, ExperimentalCoroutinesApi::class)
     @Test
     fun simpleClickWithoutMove() = runTest {
-        val scene = ComposeScene(coroutineContext = coroutineContext)
+        val scene = CanvasLayersComposeScene(coroutineContext = coroutineContext)
         try {
-            scene.constraints = Constraints.fixed(100, 100)
+            scene.size = IntSize(100, 100)
             scene.setContent {
                 Box(
                     Modifier

compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/ComposeUiTest.skikoMain.kt

@@ -30,7 +30,7 @@ import androidx.compose.ui.platform.PlatformContext
 import androidx.compose.ui.platform.WindowInfo
 import androidx.compose.ui.scene.ComposeScene
 import androidx.compose.ui.scene.ComposeSceneContext
-import androidx.compose.ui.scene.MultiLayerComposeScene
+import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.semantics.SemanticsNode
 import androidx.compose.ui.text.input.EditCommand
 import androidx.compose.ui.text.input.ImeAction
@@ -218,7 +218,7 @@ class SkikoComposeUiTest @InternalTestApi constructor(
         }
     }
 
-    private fun createUi() = MultiLayerComposeScene(
+    private fun createUi() = CanvasLayersComposeScene(
         density = density,
         size = size,
         coroutineContext = coroutineContext,

compose/ui/ui/api/desktop/ui.api

@@ -3475,6 +3475,11 @@ public final class androidx/compose/ui/res/Resources_desktopKt {
 	public static final fun useResource (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
+public final class androidx/compose/ui/scene/CanvasLayersComposeScene_skikoKt {
+	public static final fun CanvasLayersComposeScene-3tKcejY (Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/unit/IntSize;Lkotlin/coroutines/CoroutineContext;Landroidx/compose/ui/scene/ComposeSceneContext;Lkotlin/jvm/functions/Function0;)Landroidx/compose/ui/scene/ComposeScene;
+	public static synthetic fun CanvasLayersComposeScene-3tKcejY$default (Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/unit/IntSize;Lkotlin/coroutines/CoroutineContext;Landroidx/compose/ui/scene/ComposeSceneContext;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Landroidx/compose/ui/scene/ComposeScene;
+}
+
 public abstract interface class androidx/compose/ui/scene/ComposeScene {
 	public abstract fun calculateContentSize-YbymL2g ()J
 	public abstract fun close ()V
@@ -3560,6 +3565,11 @@ public final class androidx/compose/ui/scene/MultiLayerComposeScene_skikoKt {
 	public static synthetic fun MultiLayerComposeScene-3tKcejY$default (Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/unit/IntSize;Lkotlin/coroutines/CoroutineContext;Landroidx/compose/ui/scene/ComposeSceneContext;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Landroidx/compose/ui/scene/ComposeScene;
 }
 
+public final class androidx/compose/ui/scene/PlatformLayersComposeScene_skikoKt {
+	public static final fun PlatformLayersComposeScene-3tKcejY (Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/unit/IntSize;Lkotlin/coroutines/CoroutineContext;Landroidx/compose/ui/scene/ComposeSceneContext;Lkotlin/jvm/functions/Function0;)Landroidx/compose/ui/scene/ComposeScene;
+	public static synthetic fun PlatformLayersComposeScene-3tKcejY$default (Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/unit/IntSize;Lkotlin/coroutines/CoroutineContext;Landroidx/compose/ui/scene/ComposeSceneContext;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Landroidx/compose/ui/scene/ComposeScene;
+}
+
 public final class androidx/compose/ui/scene/SingleLayerComposeScene_skikoKt {
 	public static final fun SingleLayerComposeScene-3tKcejY (Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/unit/IntSize;Lkotlin/coroutines/CoroutineContext;Landroidx/compose/ui/scene/ComposeSceneContext;Lkotlin/jvm/functions/Function0;)Landroidx/compose/ui/scene/ComposeScene;
 	public static synthetic fun SingleLayerComposeScene-3tKcejY$default (Landroidx/compose/ui/unit/Density;Landroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/unit/IntSize;Lkotlin/coroutines/CoroutineContext;Landroidx/compose/ui/scene/ComposeSceneContext;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Landroidx/compose/ui/scene/ComposeScene;

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

@@ -355,7 +355,7 @@ internal class ComposeContainer(
         val density = container.density
         return when (layerType) {
             LayerType.OnSameCanvas ->
-                MultiLayerComposeScene(
+                CanvasLayersComposeScene(
                     density = density,
                     layoutDirection = layoutDirection,
                     coroutineContext = mediator.coroutineContext,
@@ -364,7 +364,7 @@ internal class ComposeContainer(
                     ),
                     invalidate = mediator::onComposeInvalidation,
                 )
-            else -> SingleLayerComposeScene(
+            else -> PlatformLayersComposeScene(
                 density = density,
                 layoutDirection = layoutDirection,
                 coroutineContext = mediator.coroutineContext,

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

@@ -159,7 +159,7 @@ internal class SwingComposeSceneLayer(
 
     private fun createComposeScene(mediator: ComposeSceneMediator): ComposeScene {
         val density = container.density
-        return SingleLayerComposeScene(
+        return PlatformLayersComposeScene(
             coroutineContext = mediator.coroutineContext,
             density = density,
             invalidate = mediator::onComposeInvalidation,

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

@@ -203,7 +203,7 @@ internal class WindowComposeSceneLayer(
     private fun createComposeScene(mediator: ComposeSceneMediator): ComposeScene {
         val density = container.density
         val layoutDirection = layoutDirectionFor(container)
-        return SingleLayerComposeScene(
+        return PlatformLayersComposeScene(
             coroutineContext = mediator.coroutineContext,
             density = density,
             invalidate = mediator::onComposeInvalidation,

compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/platform/RenderingTestScope.kt

@@ -21,7 +21,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asComposeCanvas
 import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.scene.MultiLayerComposeScene
+import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntSize
 import kotlin.coroutines.CoroutineContext
@@ -59,7 +59,7 @@ internal class RenderingTestScope(
 
     val surface: Surface = Surface.makeRasterN32Premul(width, height)
     private val canvas = surface.canvas.asComposeCanvas()
-    val scene = MultiLayerComposeScene(
+    val scene = CanvasLayersComposeScene(
         coroutineContext = coroutineContext,
         invalidate = frameDispatcher::scheduleFrame
     ).apply {

compose/ui/ui/src/jsWasmMain/kotlin/androidx/compose/ui/native/ComposeLayer.js.kt

@@ -28,7 +28,7 @@ import androidx.compose.ui.input.pointer.PointerKeyboardModifiers
 import androidx.compose.ui.platform.PlatformContext
 import androidx.compose.ui.scene.ComposeSceneContext
 import androidx.compose.ui.scene.ComposeScenePointer
-import androidx.compose.ui.scene.MultiLayerComposeScene
+import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.scene.platformContext
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntSize
@@ -55,7 +55,7 @@ internal class ComposeLayer(
         }
     }
 
-    private val scene = MultiLayerComposeScene(
+    private val scene = CanvasLayersComposeScene(
         coroutineContext = Dispatchers.Main,
         composeSceneContext = object : ComposeSceneContext {
             override val platformContext get() = platformContext

compose/ui/ui/src/macosMain/kotlin/androidx/compose/ui/window/ComposeWindow.macos.kt

@@ -29,7 +29,7 @@ import androidx.compose.ui.platform.MacosTextInputService
 import androidx.compose.ui.platform.PlatformContext
 import androidx.compose.ui.platform.WindowInfoImpl
 import androidx.compose.ui.scene.ComposeSceneContext
-import androidx.compose.ui.scene.MultiLayerComposeScene
+import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.DpSize
@@ -96,7 +96,7 @@ private class ComposeWindow(
             override val textInputService get() = macosTextInputService
         }
     private val skiaLayer = SkiaLayer()
-    private val scene = MultiLayerComposeScene(
+    private val scene = CanvasLayersComposeScene(
         coroutineContext = Dispatchers.Main,
         composeSceneContext = object : ComposeSceneContext {
             override val platformContext get() = [email protected]

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

@@ -18,8 +18,6 @@ package androidx.compose.ui
 
 import org.jetbrains.skia.Canvas as SkCanvas
 import androidx.compose.runtime.*
-import androidx.compose.ui.focus.FocusDirection
-import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.asComposeCanvas
 import androidx.compose.ui.input.key.KeyEvent
@@ -51,7 +49,8 @@ import org.jetbrains.skiko.currentNanoTime
  */
 @Deprecated(
     "Replaced with interface in scene package",
-    replaceWith = ReplaceWith("androidx.compose.ui.scene.ComposeScene")
+    replaceWith = ReplaceWith("androidx.compose.ui.scene.ComposeScene"),
+    level = DeprecationLevel.ERROR
 )
 class ComposeScene internal constructor(
     coroutineContext: CoroutineContext,
@@ -162,7 +161,7 @@ class ComposeScene internal constructor(
         invalidate = invalidate
     )
 
-    private val replacement = androidx.compose.ui.scene.MultiLayerComposeScene(
+    private val replacement = androidx.compose.ui.scene.CanvasLayersComposeScene(
         density = density,
         layoutDirection = layoutDirection,
         coroutineContext = coroutineContext,

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

@@ -34,7 +34,7 @@ import androidx.compose.ui.platform.WindowInfo
 import androidx.compose.ui.platform.WindowInfoImpl
 import androidx.compose.ui.scene.ComposeSceneContext
 import androidx.compose.ui.scene.ComposeScenePointer
-import androidx.compose.ui.scene.MultiLayerComposeScene
+import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntSize
@@ -153,7 +153,7 @@ class ImageComposeScene @ExperimentalComposeUiApi constructor(
             get() = _platformContext
     }
 
-    private val scene = MultiLayerComposeScene(
+    private val scene = CanvasLayersComposeScene(
         density = density,
         layoutDirection = layoutDirection,
         size = imageSize,

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformContext.skiko.kt

@@ -32,7 +32,7 @@ import androidx.compose.ui.node.OwnedLayer
 import androidx.compose.ui.node.Owner
 import androidx.compose.ui.node.RootForTest
 import androidx.compose.ui.scene.ComposeScene
-import androidx.compose.ui.scene.MultiLayerComposeScene
+import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.semantics.SemanticsNode
 import androidx.compose.ui.semantics.SemanticsOwner
 import androidx.compose.ui.text.input.EditCommand
@@ -57,7 +57,7 @@ interface PlatformContext {
      * This is used when rendering the scrim of a dialog - if set to true, a special blending mode
      * will be used to take into account the existing alpha-channel values.
      *
-     * @see MultiLayerComposeScene
+     * @see CanvasLayersComposeScene
      */
     val isWindowTransparent: Boolean get() = false