JetBrains · eymar · Aug 12, 2024 · Aug 5, 2024 · Aug 5, 2024 · Aug 5, 2024
diff --git a/...i/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt b/...i/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/platform/DesktopFont.desktop.kt
@@ -24,7 +24,6 @@ import org.jetbrains.skia.Data
 import org.jetbrains.skia.FontMgr
 import org.jetbrains.skia.FontSlant
 import org.jetbrains.skia.FontWidth
-import org.jetbrains.skia.makeFromFile
 
 actual sealed class PlatformFont : Font {
     actual abstract val identity: String
@@ -168,10 +167,11 @@ internal actual fun loadTypeface(font: Font): SkTypeface {
     return when (font) {
         is ResourceFont -> typefaceResource(font.name)
         // TODO: replace with FontMgr.makeFromFile(font.file.toString())
-        is FileFont -> SkTypeface.makeFromFile(font.file.toString())
+        is FileFont -> FontMgr.default.makeFromFile(font.file.toString())
         is LoadedFont -> FontMgr.default.makeFromData(Data.makeFromBytes(font.getData()))
         is SystemFont -> FontMgr.default.matchFamilyStyle(font.identity, font.skFontStyle)
-    } ?: SkTypeface.makeFromName(SkTypeface.makeDefault().familyName, font.skFontStyle)
+    } ?: (FontMgr.default.legacyMakeTypeface(font.identity, font.skFontStyle)
+        ?: error("loadTypeface legacyMakeTypeface failed"))
 }
 
 private fun typefaceResource(resourceName: String): SkTypeface {
@@ -181,7 +181,7 @@ private fun typefaceResource(resourceName: String): SkTypeface {
         ?: error("Can't load font from $resourceName")
 
     val bytes = resource.use { it.readAllBytes() }
-    return SkTypeface.makeFromData(Data.makeFromBytes(bytes))
+    return FontMgr.default.makeFromData(Data.makeFromBytes(bytes))!!
 }
 
 private val Font.skFontStyle: SkFontStyle

diff --git a/.../src/desktopMain/kotlin/androidx/compose/ui/text/platform/JetBrainsRuntimeFontFamilies.kt b/.../src/desktopMain/kotlin/androidx/compose/ui/text/platform/JetBrainsRuntimeFontFamilies.kt
@@ -23,8 +23,8 @@ import androidx.compose.ui.text.font.FontWeight
 import java.io.File
 import kotlin.io.path.Path
 import kotlin.io.path.absolutePathString
+import org.jetbrains.skia.FontMgr
 import org.jetbrains.skia.FontSlant
-import org.jetbrains.skia.makeFromFile
 
 internal object JetBrainsRuntimeFontFamilies {
 
@@ -97,7 +97,8 @@ internal object JetBrainsRuntimeFontFamilies {
                     val absolutePath = path.absolutePathString()
 
                     // We need to parse the typeface to extract its weight and style
-                    val typeface = org.jetbrains.skia.Typeface.makeFromFile(absolutePath)
+                    val typeface = FontMgr.default.makeFromFile(absolutePath)
+                        ?: error("makeFromFile $absolutePath failed")
                     val weight = FontWeight(typeface.fontStyle.weight)
                     val style = when (typeface.fontStyle.slant) {
                         FontSlant.UPRIGHT -> FontStyle.Normal

diff --git a/compose/ui/ui-text/src/desktopTest/kotlin/androidx/compose/ui/text/DesktopFontTest.kt b/compose/ui/ui-text/src/desktopTest/kotlin/androidx/compose/ui/text/DesktopFontTest.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.text.platform.Typeface
 import androidx.compose.ui.text.platform.aliases
 import com.google.common.truth.Truth
 import org.jetbrains.skia.Data
-import org.jetbrains.skia.Typeface
+import org.jetbrains.skia.FontMgr
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -56,7 +56,8 @@ class DesktopFontTest {
             .contextClassLoader
             .getResourceAsStream("font/sample_font.ttf")!!
             .readAllBytes()
-        Typeface.makeFromData(Data.makeFromBytes(bytes))
+        FontMgr.default.makeFromData(Data.makeFromBytes(bytes))
+            ?: error("loadedTypeface failed: FontMgr.default.makeFromData returned null")
     }
 
     private val loadedFontFamily by lazy {

diff --git a/...e/ui/ui-text/src/nativeMain/kotlin/androidx/compose/ui/text/platform/NativeFont.native.kt b/...e/ui/ui-text/src/nativeMain/kotlin/androidx/compose/ui/text/platform/NativeFont.native.kt
@@ -21,6 +21,7 @@ import org.jetbrains.skia.FontStyle as SkFontStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontStyle
 import org.jetbrains.skia.Data
+import org.jetbrains.skia.FontMgr
 import org.jetbrains.skia.FontSlant
 import org.jetbrains.skia.FontWidth
 
@@ -30,8 +31,10 @@ internal actual fun loadTypeface(font: Font): SkTypeface {
     }
     @Suppress("REDUNDANT_ELSE_IN_WHEN")
     return when (font) {
-        is LoadedFont -> SkTypeface.makeFromData(Data.makeFromBytes(font.getData()))
-        is SystemFont -> SkTypeface.makeFromName(font.identity, font.skFontStyle)
+        is LoadedFont -> FontMgr.default.makeFromData(Data.makeFromBytes(font.getData()))
+            ?: error("loadTypeface makeFromData failed")
+        is SystemFont -> FontMgr.default.legacyMakeTypeface(font.identity, font.skFontStyle)
+            ?: error("loadTypeface legacyMakeTypeface failed")
         // TODO: compilation fails without `else` see https://youtrack.jetbrains.com/issue/KT-43875
         else -> throw IllegalArgumentException("Unsupported font type: $font")
     }

diff --git a/compose/ui/ui-text/src/webCommonW3C/kotlin/androidx/compose/ui/text/platform/WebFont.kt b/compose/ui/ui-text/src/webCommonW3C/kotlin/androidx/compose/ui/text/platform/WebFont.kt
@@ -20,6 +20,7 @@ import org.jetbrains.skia.FontStyle as SkFontStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontStyle
 import org.jetbrains.skia.Data
+import org.jetbrains.skia.FontMgr
 import org.jetbrains.skia.FontSlant
 import org.jetbrains.skia.FontWidth
 import org.jetbrains.skiko.OS
@@ -30,8 +31,10 @@ internal actual fun loadTypeface(font: Font): SkTypeface {
         throw IllegalArgumentException("Unsupported font type: $font")
     }
     return when (font) {
-        is LoadedFont -> SkTypeface.makeFromData(Data.makeFromBytes(font.getData()))
-        is SystemFont -> SkTypeface.makeFromName(font.identity, font.skFontStyle)
+        is LoadedFont -> FontMgr.default.makeFromData(Data.makeFromBytes(font.getData()))
+            ?: error("loadTypeface makeFromData failed")
+        is SystemFont -> FontMgr.default.legacyMakeTypeface(font.identity, font.skFontStyle)
+            ?: error("loadTypeface legacyMakeTypeface failed")
     }
 }
 

diff --git a/...desktop/androidx_compose_ui_ComposeSceneTest_change_density_frame1_density2.png b/...desktop/androidx_compose_ui_ComposeSceneTest_change_density_frame1_density2.png
diff --git a/...desktop/androidx_compose_ui_ComposeSceneTest_change_density_frame2_density3.png b/...desktop/androidx_compose_ui_ComposeSceneTest_change_density_frame2_density3.png
diff --git a/...i/ui-desktop/androidx_compose_ui_ImageComposeSceneTest_run_dialog_in_center.png b/...i/ui-desktop/androidx_compose_ui_ImageComposeSceneTest_run_dialog_in_center.png
diff --git a/...ose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_arc.png b/...ose/ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_arc.png
diff --git a/.../ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_bezier.png b/.../ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_bezier.png
diff --git a/...i/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_clipPath.png b/...i/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_clipPath.png
diff --git a/...e/ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_cubic.png b/...e/ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_cubic.png
diff --git a/...ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_figures.png b/...ui/ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_figures.png
diff --git a/.../ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_linesFill.png b/.../ui-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_linesFill.png
diff --git a/...i-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_linesStroke.png b/...i-desktop/graphics/androidx_compose_ui_graphics_DesktopPathTest_linesStroke.png
diff --git a/...phics/androidx_compose_ui_graphics_canvas_DesktopCanvasPointsTest_drawLines.png b/...phics/androidx_compose_ui_graphics_canvas_DesktopCanvasPointsTest_drawLines.png
diff --git a/...hics/androidx_compose_ui_graphics_canvas_DesktopCanvasPointsTest_drawPoints.png b/...hics/androidx_compose_ui_graphics_canvas_DesktopCanvasPointsTest_drawPoints.png
diff --git a/...cs/androidx_compose_ui_graphics_canvas_DesktopCanvasPointsTest_drawPolygons.png b/...cs/androidx_compose_ui_graphics_canvas_DesktopCanvasPointsTest_drawPolygons.png
diff --git a/...ktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawArc.png b/...ktop/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawArc.png
diff --git a/...p/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawCircle.png b/...p/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawCircle.png
diff --git a/...top/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawLine.png b/...top/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawLine.png
diff --git a/...top/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawOval.png b/...top/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawOval.png
diff --git a/...raphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawRoundRect.png b/...raphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_drawRoundRect.png
diff --git a/...op/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_transform.png b/...op/graphics/androidx_compose_ui_graphics_canvas_DesktopCanvasTest_transform.png
diff --git a/.../ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_clip.png b/.../ui/ui-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_clip.png
diff --git a/...i-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_elevation.png b/...i-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_elevation.png
diff --git a/...i-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationX.png b/...i-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationX.png
diff --git a/...desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationXYZ.png b/...desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationXYZ.png
diff --git a/...i-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationY.png b/...i-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationY.png
diff --git a/...i-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationZ.png b/...i-desktop/platform/androidx_compose_ui_platform_GraphicsLayerTest_rotationZ.png
diff --git a/...es/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_and_fill_bounds.png b/...es/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_and_fill_bounds.png
diff --git a/...s/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_custom_size.png b/...s/androidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_custom_size.png
diff --git a/...ndroidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_specified_size.png b/...ndroidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_specified_size.png
diff --git a/...roidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_unspecified_size.png b/...roidx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_unspecified_size.png
diff --git a/...dx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_unspecified_viewbox.png b/...dx_compose_ui_res_DesktopSvgResourcesTest_load_SVG_with_unspecified_viewbox.png
diff --git a/...s_DesktopSvgResourcesTest_load_SVG_with_unspecified_viewbox_and_fill_bounds.png b/...s_DesktopSvgResourcesTest_load_SVG_with_unspecified_viewbox_and_fill_bounds.png
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -54,7 +54,7 @@ moshi = "1.13.0"
 protobuf = "3.21.8"
 paparazzi = "1.0.0"
 paparazziNative = "2022.1.1-canary-f5f9f71"
-skiko = "0.8.9"
+skiko = "0.8.10.1"
 sqldelight = "1.3.0"
 retrofit = "2.7.2"
 wire = "4.5.1"