Merge "A couple more declarations made expect in skikoMain" into androidx-main
diff --git a/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt b/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt
index 2d0d8c8..4a7a9f2 100644
--- a/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt
+++ b/compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt
@@ -31,6 +31,12 @@
import org.jetbrains.skia.makeFromFile
import org.jetbrains.skia.Typeface as SkTypeface
+actual sealed class PlatformFont : Font {
+ actual abstract val identity: String
+ internal actual val cacheKey: String
+ get() = "${this::class.qualifiedName}|$identity"
+}
+
internal val GenericFontFamiliesMapping by lazy {
when (Platform.Current) {
Platform.Windows ->
diff --git a/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/PlatformFont.skiko.kt b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/PlatformFont.skiko.kt
index 1df3f12c..0b8c2fc 100644
--- a/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/PlatformFont.skiko.kt
+++ b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/PlatformFont.skiko.kt
@@ -32,11 +32,9 @@
import androidx.compose.ui.text.font.Typeface
import androidx.compose.ui.text.font.createFontFamilyResolver
-sealed class PlatformFont : Font {
+expect sealed class PlatformFont : Font {
abstract val identity: String
-
internal val cacheKey: String
- get() = "${this::class.qualifiedName}|$identity"
}
/**
diff --git a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/ComposeScene.desktop.kt b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/ComposeScene.desktop.kt
index 8cabc6c..e83fe3b 100644
--- a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/ComposeScene.desktop.kt
+++ b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/ComposeScene.desktop.kt
@@ -91,4 +91,6 @@
internal actual fun makeAccessibilityController(
skiaBasedOwner: SkiaBasedOwner,
component: PlatformComponent
-): AccessibilityController = AccessibilityControllerImpl(skiaBasedOwner, component)
\ No newline at end of file
+): AccessibilityController = AccessibilityControllerImpl(skiaBasedOwner, component)
+
+internal actual fun currentMillis(): Long = System.currentTimeMillis()
diff --git a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/ComposeScene.skiko.kt b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/ComposeScene.skiko.kt
index 903f56a..2669912 100644
--- a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/ComposeScene.skiko.kt
+++ b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/ComposeScene.skiko.kt
@@ -370,7 +370,7 @@
eventType: PointerEventType,
position: Offset,
scrollDelta: Offset = Offset(0f, 0f),
- timeMillis: Long = System.nanoTime() / 1_000_000L,
+ timeMillis: Long = currentMillis(),
type: PointerType = PointerType.Mouse,
buttons: PointerButtons? = null,
keyboardModifiers: PointerKeyboardModifiers? = null,
@@ -482,3 +482,5 @@
skiaBasedOwner: SkiaBasedOwner,
component: PlatformComponent
): AccessibilityController
+
+internal expect fun currentMillis(): Long
