Register the Skiko UI implementation at Compose entry points

MatkovIvan · MatkovIvan · commit 6c2196843e2a · 2026-06-17T12:50:57.000+02:00
Wire registerSkikoComposeImplementation() into the Skiko-backed Compose
entry points so the ui-graphics/ui-text registries are populated before
any scene is created: desktop ComposePanel/ComposeWindowPanel, macOS
ComposeWindow, iOS ComposeUIViewController, web ComposeWindowInternal,
ImageComposeScene, and the ui-test rules. Adds the :compose:ui:ui-skiko
dependency to the modules that rely on the Skiko backend transitively
(ui, ui-test, ui-test-junit4, foundation) and registers in the affected
test harnesses.
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
@@ -125,6 +125,7 @@ androidXMultiplatform {
                 // TODO(https://youtrack.jetbrains.com/issue/CMP-219) Remove API
                 api(libs.skiko)
                 implementation(libs.atomicFu)
+                implementation(project(":compose:ui:ui-skiko"))
             }
         }
 
diff --git a/compose/ui/ui-test-junit4/build.gradle b/compose/ui/ui-test-junit4/build.gradle
@@ -119,6 +119,7 @@ androidXMultiplatform {
             dependencies {
                 implementation(libs.truth)
                 implementation(libs.skiko)
+                implementation(project(":compose:ui:ui-skiko"))
             }
         }
 
diff --git a/compose/ui/ui-test-junit4/src/desktopMain/kotlin/androidx/compose/ui/test/junit4/DesktopComposeTestRule.desktop.kt b/compose/ui/ui-test-junit4/src/desktopMain/kotlin/androidx/compose/ui/test/junit4/DesktopComposeTestRule.desktop.kt
@@ -18,6 +18,7 @@ package androidx.compose.ui.test.junit4
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.InternalComposeUiApi
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.ComposeScene
 import androidx.compose.ui.test.DesktopComposeUiTest
 import androidx.compose.ui.test.ExperimentalTestApi
@@ -44,14 +45,16 @@ import org.junit.runners.model.Statement
             "coroutines are queued rather than executed immediately.",
     level = DeprecationLevel.WARNING,
 )
-@OptIn(InternalTestApi::class, ExperimentalTestApi::class)
-actual fun createComposeRule(): ComposeContentTestRule =
-    DesktopComposeTestRule(
+@OptIn(InternalTestApi::class, ExperimentalTestApi::class, InternalComposeUiApi::class)
+actual fun createComposeRule(): ComposeContentTestRule {
+    registerSkikoComposeImplementation()
+    return DesktopComposeTestRule(
         DesktopComposeUiTest(
             effectContext = EmptyCoroutineContext,
             useStandardTestDispatcherForComposition = false
         )
     )
+}
 
 @Deprecated(
     message =
@@ -61,14 +64,16 @@ actual fun createComposeRule(): ComposeContentTestRule =
     level = DeprecationLevel.WARNING,
 )
 @ExperimentalTestApi
-@OptIn(InternalTestApi::class)
-actual fun createComposeRule(effectContext: CoroutineContext): ComposeContentTestRule =
-    DesktopComposeTestRule(
+@OptIn(InternalTestApi::class, InternalComposeUiApi::class)
+actual fun createComposeRule(effectContext: CoroutineContext): ComposeContentTestRule {
+    registerSkikoComposeImplementation()
+    return DesktopComposeTestRule(
         DesktopComposeUiTest(
             effectContext = effectContext,
             useStandardTestDispatcherForComposition = false
         )
     )
+}
 
 @InternalTestApi
 @OptIn(ExperimentalTestApi::class)
diff --git a/compose/ui/ui-test-junit4/src/desktopMain/kotlin/androidx/compose/ui/test/junit4/DesktopScreenshotTestRule.desktop.kt b/compose/ui/ui-test-junit4/src/desktopMain/kotlin/androidx/compose/ui/test/junit4/DesktopScreenshotTestRule.desktop.kt
@@ -16,6 +16,8 @@
 package androidx.compose.ui.test.junit4
 
 import androidx.annotation.FloatRange
+import androidx.compose.ui.InternalComposeUiApi
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.test.InternalTestApi
 import androidx.compose.ui.test.junit4.ScreenshotResultProto.Status
 import androidx.compose.ui.test.junit4.matchers.BitmapMatcher
@@ -57,10 +59,12 @@ private data class ScreenshotResultProto(
 }
 
 @InternalTestApi
+@OptIn(InternalComposeUiApi::class)
 fun DesktopScreenshotTestRule(
     modulePath: String,
     fsGoldenPath: String = System.getProperty("GOLDEN_PATH")
 ): ScreenshotTestRule {
+    registerSkikoComposeImplementation()
     return ScreenshotTestRule(fsGoldenPath, modulePath)
 }
 
diff --git a/compose/ui/ui-test/build.gradle b/compose/ui/ui-test/build.gradle
@@ -125,6 +125,7 @@ androidXMultiplatform {
             dependsOn(commonMain)
             dependencies {
                 implementation(libs.atomicFu)
+                implementation(project(":compose:ui:ui-skiko"))
 
                 // Required to properly resolve supertypes of DefaultArchitectureComponentsOwner
                 // Keep in sync with :ui:ui module
diff --git a/compose/ui/ui-test/src/desktopMain/kotlin/androidx/compose/ui/test/ComposeUiTest.desktop.kt b/compose/ui/ui-test/src/desktopMain/kotlin/androidx/compose/ui/test/ComposeUiTest.desktop.kt
@@ -16,6 +16,8 @@
 
 package androidx.compose.ui.test
 
+import androidx.compose.ui.InternalComposeUiApi
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.unit.Density
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
@@ -38,6 +40,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
     level = DeprecationLevel.WARNING,
 )
 @ExperimentalTestApi
+@OptIn(InternalComposeUiApi::class)
 fun runDesktopComposeUiTest(
     width: Int = 1024,
     height: Int = 768,
@@ -46,6 +49,7 @@ fun runDesktopComposeUiTest(
     testTimeout: Duration = Duration.INFINITE,
     block: suspend DesktopComposeUiTest.() -> Unit
 ) {
+    registerSkikoComposeImplementation()
     kotlinx.coroutines.test.runTest {
         with(
             DesktopComposeUiTest(
diff --git a/compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/ComposeUiTest.skiko.kt b/compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/ComposeUiTest.skiko.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.platform.PlatformDragAndDropSource
 import androidx.compose.ui.platform.PlatformTextInputMethodRequest
 import androidx.compose.ui.platform.PlatformWindowInsets
 import androidx.compose.ui.platform.WindowInfo
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.scene.ComposeScene
 import androidx.compose.ui.semantics.SemanticsNode
@@ -113,6 +114,7 @@ fun runSkikoComposeUiTest(
     testTimeout: Duration = Duration.INFINITE,
     block: suspend SkikoComposeUiTest.() -> Unit
 ): TestResult {
+    registerSkikoComposeImplementation()
     return SkikoComposeUiTest(
         width = size.width.roundToInt(),
         height = size.height.roundToInt(),
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
@@ -206,6 +206,7 @@ androidXMultiplatform {
             dependsOn(commonMain)
             dependencies {
                 api(project(":compose:ui:ui-graphics"))
+                implementation(project(":compose:ui:ui-skiko"))
                 api(project(":compose:ui:ui-text"))
                 api(libs.skiko)
                 implementation(libs.atomicFu)
@@ -222,6 +223,7 @@ androidXMultiplatform {
                 // TODO: Move to commonTest?
                 implementation(project(":compose:material:material"))
                 implementation(project(":compose:foundation:foundation"))
+                implementation(project(":compose:ui:ui-skiko"))
                 implementation(project(":compose:ui:ui-test"))
             }
         }
diff --git a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposePanel.desktop.kt b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposePanel.desktop.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.awt.RenderSettings.SkiaSurface
 import androidx.compose.ui.awt.RenderSettings.SwingGraphics
 import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.isClearFocusOnMouseDownEnabled
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.ComposeContainer
 import androidx.compose.ui.semantics.SemanticsOwner
 import androidx.compose.ui.unit.ExperimentalUnitApi
@@ -96,6 +97,7 @@ class ComposePanel @ExperimentalComposeUiApi constructor(
     }
 
     init {
+        registerSkikoComposeImplementation()
         check(isEventDispatchThread()) {
             "ComposePanel should be created inside AWT Event Dispatch Thread" +
                 " (use SwingUtilities.invokeLater).\n" +
diff --git a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposeWindowPanel.desktop.kt b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposeWindowPanel.desktop.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.ComposeFeatureFlags
 import androidx.compose.ui.LayerType
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.key.KeyEvent
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.ComposeContainer
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.IntSize
@@ -108,6 +109,7 @@ internal class ComposeWindowPanel(
         }
 
     init {
+        registerSkikoComposeImplementation()
         layout = null
         focusTraversalPolicy = object : FocusTraversalPolicy() {
             override fun getComponentAfter(aContainer: Container?, aComponent: Component?) = null
diff --git a/compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/platform/GraphicLayerBugTest.desktop.kt b/compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/platform/GraphicLayerBugTest.desktop.kt
@@ -28,6 +28,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshots.Snapshot
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.asComposeCanvas
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.scene.ComposeScene
 import androidx.compose.ui.unit.dp
@@ -90,6 +91,7 @@ class GraphicLayerBugDesktopTest {
                 coroutineException = throwable
             }
         ) {
+            registerSkikoComposeImplementation()
             val frameRecomposer = FrameRecomposer(coroutineContext)
             val scene = CanvasLayersComposeScene(
                 frameRecomposer = frameRecomposer,
diff --git a/compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/platform/RenderingTestScope.kt b/compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/platform/RenderingTestScope.kt
@@ -62,6 +62,11 @@ internal class RenderingTestScope(
 
     val surface: Surface = Surface.makeRasterN32Premul(width, height)
     private val canvas = surface.canvas.asComposeCanvas()
+
+    init {
+        registerSkikoComposeImplementation()
+    }
+
     val scene = CanvasLayersComposeScene(
         frameRecomposer = frameRecomposer,
         invalidateLayout = sceneRenderingScope::onSceneInvalidation,
diff --git a/compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/window/ComposeUIViewController.ios.kt b/compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/window/ComposeUIViewController.ios.kt
@@ -17,6 +17,7 @@
 package androidx.compose.ui.window
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.ComposeHostingViewController
 import androidx.compose.ui.uikit.ComposeUIViewControllerConfiguration
 import platform.UIKit.UIViewController
@@ -47,7 +48,10 @@ fun ComposeUIViewController(content: @Composable () -> Unit): UIViewController =
 fun ComposeUIViewController(
     configure: ComposeUIViewControllerConfiguration.() -> Unit = {},
     content: @Composable () -> Unit
-): UIViewController = ComposeHostingViewController(
-    configuration = ComposeUIViewControllerConfiguration().apply(configure),
-    content = content,
-)
+): UIViewController {
+    registerSkikoComposeImplementation()
+    return ComposeHostingViewController(
+        configuration = ComposeUIViewControllerConfiguration().apply(configure),
+        content = content,
+    )
+}
diff --git a/compose/ui/ui/src/macosMain/kotlin/androidx/compose/ui/window/ComposeWindow.macos.kt b/compose/ui/ui/src/macosMain/kotlin/androidx/compose/ui/window/ComposeWindow.macos.kt
@@ -31,6 +31,7 @@ import androidx.compose.ui.platform.DefaultArchitectureComponentsOwner
 import androidx.compose.ui.platform.MacosTextInputService
 import androidx.compose.ui.platform.PlatformContext
 import androidx.compose.ui.platform.WindowInfoImpl
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.scene.SingleComposeSceneRenderingScope
 import androidx.compose.ui.platform.FrameRecomposer
@@ -122,6 +123,11 @@ private class ComposeWindow(
             }
         }
     private val skiaLayer = SkiaLayer()
+
+    init {
+        registerSkikoComposeImplementation()
+    }
+
     private val scene = CanvasLayersComposeScene(
         frameRecomposer = frameRecomposer,
         platformContext = platformContext,
diff --git a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/ImageComposeScene.skiko.kt b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/ImageComposeScene.skiko.kt
@@ -34,6 +34,7 @@ import androidx.compose.ui.input.pointer.PointerType
 import androidx.compose.ui.platform.PlatformContext
 import androidx.compose.ui.platform.WindowInfo
 import androidx.compose.ui.platform.WindowInfoImpl
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.platform.FrameRecomposer
 import androidx.compose.ui.scene.ComposeScene
@@ -186,6 +187,10 @@ class ImageComposeScene @ExperimentalComposeUiApi constructor(
             get() = _windowInfo
     }
 
+    init {
+        registerSkikoComposeImplementation()
+    }
+
     private val scene = CanvasLayersComposeScene(
         frameRecomposer = frameRecomposer,
         density = density,
diff --git a/compose/ui/ui/src/skikoTest/kotlin/androidx/compose/ui/input/pointer/PointerIconTest.kt b/compose/ui/ui/src/skikoTest/kotlin/androidx/compose/ui/input/pointer/PointerIconTest.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.isEqualTo
 import androidx.compose.ui.platform.FrameRecomposer
 import androidx.compose.ui.platform.LocalPointerIconService
 import androidx.compose.ui.platform.PlatformContext
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.ComposeScene
 import androidx.compose.ui.scene.ComposeSceneContext
 import androidx.compose.ui.scene.PlatformLayersComposeScene
@@ -364,6 +365,7 @@ private fun createPlatformLayersScene(
     platformContext: PlatformContext,
     invalidate: () -> Unit = {},
 ): Pair<ComposeScene, FrameRecomposer> {
+    registerSkikoComposeImplementation()
     val frameRecomposer = FrameRecomposer(coroutineContext, invalidate)
     val scene = PlatformLayersComposeScene(
         frameRecomposer = frameRecomposer,
diff --git a/compose/ui/ui/src/skikoTest/kotlin/androidx/compose/ui/scene/BaseComposeSceneTest.kt b/compose/ui/ui/src/skikoTest/kotlin/androidx/compose/ui/scene/BaseComposeSceneTest.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.node.DelegatingNode
 import androidx.compose.ui.node.ModifierNodeElement
 import androidx.compose.ui.node.PointerInputModifierNode
 import androidx.compose.ui.platform.FrameRecomposer
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.unit.IntSize
 import kotlin.coroutines.CoroutineContext
 import kotlin.test.Test
@@ -161,6 +162,7 @@ private fun createPlatformLayersScene(
     invalidateLayout: () -> Unit = {},
     invalidateDraw: () -> Unit = {},
 ): Pair<ComposeScene, AutoCloseable> {
+    registerSkikoComposeImplementation()
     val frameRecomposer = FrameRecomposer(coroutineContext)
     val scene = PlatformLayersComposeScene(
         frameRecomposer = frameRecomposer,
@@ -180,6 +182,7 @@ private fun createCanvasLayersScene(
     invalidateLayout: () -> Unit = {},
     invalidateDraw: () -> Unit = {},
 ): Pair<ComposeScene, AutoCloseable> {
+    registerSkikoComposeImplementation()
     val frameRecomposer = FrameRecomposer(coroutineContext)
     val scene = CanvasLayersComposeScene(
         frameRecomposer = frameRecomposer,
diff --git a/compose/ui/ui/src/skikoTest/kotlin/androidx/compose/ui/scene/CanvasLayersComposeSceneTest.kt b/compose/ui/ui/src/skikoTest/kotlin/androidx/compose/ui/scene/CanvasLayersComposeSceneTest.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.pointer.PointerEventType
 import androidx.compose.ui.platform.FrameRecomposer
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
@@ -37,6 +38,7 @@ class CanvasLayersComposeSceneTest {
 
     @Test
     fun sceneSizeChangeTriggersInvalidation() = runTest(StandardTestDispatcher()) {
+        registerSkikoComposeImplementation()
         var invalidationCount = 0
         val frameRecomposer = FrameRecomposer(coroutineContext)
         CanvasLayersComposeScene(
@@ -56,6 +58,7 @@ class CanvasLayersComposeSceneTest {
 
     @Test
     fun cancelClickForGestureOwner() = runTest(StandardTestDispatcher()) {
+        registerSkikoComposeImplementation()
         var rootCancelled = false
         var popupCancelled = false
         val frameRecomposer = FrameRecomposer(coroutineContext)
diff --git a/compose/ui/ui/src/skikoTest/kotlin/androidx/compose/ui/window/PopupTest.kt b/compose/ui/ui/src/skikoTest/kotlin/androidx/compose/ui/window/PopupTest.kt
@@ -50,6 +50,7 @@ import androidx.compose.ui.platform.PlatformContext
 import androidx.compose.ui.platform.PlatformInsets
 import androidx.compose.ui.platform.PlatformWindowInsets
 import androidx.compose.ui.platform.WindowInfoImpl
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.platform.FrameRecomposer
@@ -812,6 +813,7 @@ class PopupTest {
             }
             error("ComposeScene did not become idle")
         }
+        registerSkikoComposeImplementation()
         scene = CanvasLayersComposeScene(
             frameRecomposer = frameRecomposer,
             platformContext = PlatformContext.Empty().also {
diff --git a/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/integrations/ComposeSceneMediatorTest.kt b/compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/integrations/ComposeSceneMediatorTest.kt
@@ -20,6 +20,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.navigationevent.UIKitNavigationEventInput
 import androidx.compose.ui.platform.DefaultArchitectureComponentsOwner
 import androidx.compose.ui.platform.PlatformWindowContext
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.ComposeSceneContext
 import androidx.compose.ui.scene.ComposeSceneMediator
 import androidx.compose.ui.scene.PlatformLayersComposeScene
@@ -112,6 +113,7 @@ class ComposeSceneMediatorTest {
             ),
             interfaceOrientationState = mutableStateOf(InterfaceOrientation.Portrait),
             composeSceneFactory = { invalidate, platformContext, frameRecomposer ->
+                registerSkikoComposeImplementation()
                 PlatformLayersComposeScene(
                     frameRecomposer = frameRecomposer,
                     density = Density(1f),
diff --git a/compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/window/ComposeWindowInternal.web.kt b/compose/ui/ui/src/webMain/kotlin/androidx/compose/ui/window/ComposeWindowInternal.web.kt
@@ -63,6 +63,7 @@ import androidx.compose.ui.platform.WebTextInputService
 import androidx.compose.ui.platform.WebTextToolbar
 import androidx.compose.ui.platform.WebWakeLockManager
 import androidx.compose.ui.platform.WindowInfoImpl
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.platform.accessibility.ComposeWebSemanticsListener
 import androidx.compose.ui.platform.installFallbackFontDownloader
 import androidx.compose.ui.scene.CanvasLayersComposeScene
@@ -347,6 +348,10 @@ internal class ComposeWindow(
         }
     }
 
+    init {
+        registerSkikoComposeImplementation()
+    }
+
     private val scene = CanvasLayersComposeScene(
         frameRecomposer = frameRecomposer,
         platformContext = platformContext,

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ androidXMultiplatform {`
`125`	`125`	`// TODO(https://youtrack.jetbrains.com/issue/CMP-219) Remove API`
`126`	`126`	`api(libs.skiko)`
`127`	`127`	`implementation(libs.atomicFu)`
	`128`	`+ implementation(project(":compose:ui:ui-skiko"))`
`128`	`129`	`}`
`129`	`130`	`}`
`130`	`131`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ androidXMultiplatform {`
`119`	`119`	`dependencies {`
`120`	`120`	`implementation(libs.truth)`
`121`	`121`	`implementation(libs.skiko)`
	`122`	`+ implementation(project(":compose:ui:ui-skiko"))`
`122`	`123`	`}`
`123`	`124`	`}`
`124`	`125`