Update skia to m144

.github/actions/docker-skiko-run/action.yml

@@ -90,6 +90,7 @@ runs:
         docker run --rm \
           -v "${{ github.workspace }}":/workspace \
           -v "${HOME}/.gradle":/gradle-cache \
+          -v "${HOME}/.m2":/root/.m2 \
           -e GRADLE_USER_HOME=/gradle-cache \
           -w /workspace/${{ inputs.working_directory }} \
           "ghcr.io/${{ steps.vars.outputs.image_namespace }}/${{ inputs.image_name }}:${{ steps.vars.outputs.tag }}" \

.github/workflows/publish-dry-run.yml

@@ -30,6 +30,7 @@ jobs:
           working_directory: samples/SkiaAndroidSample
           command: |
             ./gradlew --no-daemon --stacktrace \
+              --refresh-dependencies \
               packageRelease
 
   Web:
@@ -76,6 +77,7 @@ jobs:
           image_name: linux-compat
           command: |
             ./gradlew --no-daemon --stacktrace \
+              --refresh-dependencies \
               :SkiaAwtSample:installDist
 
   macOS:
@@ -105,6 +107,7 @@ jobs:
         name: 'Check AWT Sample'
         run: |
           ./gradlew --no-daemon --stacktrace \
+            --refresh-dependencies \
             :SkiaAwtSample:installDist
 
   Windows:
@@ -138,4 +141,5 @@ jobs:
         name: 'Check AWT Sample'
         run: |
           ./gradlew --no-daemon --stacktrace \
+            --refresh-dependencies \
             :SkiaAwtSample:installDist

.github/workflows/tests.yml

@@ -376,8 +376,8 @@ jobs:
             git clone https://github.com/emscripten-core/emsdk.git
             cd ./emsdk
           fi
-          ./emsdk install 3.1.50
-          ./emsdk activate 3.1.50
+          ./emsdk install 4.0.7
+          ./emsdk activate 4.0.7
 
       - shell: bash
         name: 'Run WASM Tests'

samples/SkiaAwtSample/src/main/kotlin/SkiaAwtSample/ClocksAwt.kt

@@ -89,11 +89,14 @@ open class ClocksAwt(
         val y = ypos.toFloat()
         canvas.drawString(text, x, y, font, paint)
 
-        val style = ParagraphStyle().apply {
-            fontRastrSettings = FontRastrSettings(FontEdging.SUBPIXEL_ANTI_ALIAS, FontHinting.SLIGHT, true)
-        }
+        val style = ParagraphStyle()
         val paragraph = ParagraphBuilder(style, fontCollection)
-            .pushStyle(TextStyle().setColor(0xFF000000.toInt()))
+            .pushStyle(TextStyle().apply {
+                color = 0xFF000000.toInt()
+                fontEdging = FontEdging.SUBPIXEL_ANTI_ALIAS
+                fontHinting = FontHinting.SLIGHT
+                subpixel = true
+            })
             .addText("Graphic API: ${renderProvider()}, JRE: ${System.getProperty("java.vendor")}, ${System.getProperty("java.runtime.version")} $currentSystemTheme")
             .popStyle()
             .build()
@@ -123,4 +126,4 @@ open class ClocksAwt(
         xpos = e.x
         ypos = e.y
     }
-}
+}

skiko/buildSrc/src/main/kotlin/properties.kt

@@ -10,7 +10,7 @@ enum class OS(
     Linux("linux", arrayOf()),
     Android("android", arrayOf()),
     Windows("windows", arrayOf()),
-    MacOS("macos", arrayOf("-mmacosx-version-min=10.15")),
+    MacOS("macos", arrayOf("-mmacosx-version-min=11.0")),
     Wasm("wasm", arrayOf()),
     IOS("ios", arrayOf()),
     TVOS("tvos", arrayOf())

skiko/buildSrc/src/main/kotlin/tasks/configuration/CommonTasksConfiguration.kt

@@ -65,8 +65,8 @@ fun skiaPreprocessorFlags(os: OS, buildType: SkiaBuildType): Array<String> {
         "-DSK_SHAPER_UNICODE_AVAILABLE",
         "-DSK_SUPPORT_OPENCL=0",
         "-DSK_UNICODE_AVAILABLE",
-        "-DU_DISABLE_RENAMING",
         "-DSK_USING_THIRD_PARTY_ICU",
+        "-DSK_HIDE_PATH_EDIT_METHODS", // Temporary (m144) skia flag for migration to SkPathBuilder
         // For ICU symbols renaming:
         "-DU_DISABLE_RENAMING=0",
         "-DU_DISABLE_VERSION_SUFFIX=1",
@@ -355,4 +355,4 @@ fun KotlinTarget.generateVersion(
             (this as KotlinCompileTool).source(generatedDir.get().asFile)
         }
     }
-}
+}

skiko/docker/linux-emscripten-amd64/Dockerfile

@@ -10,7 +10,7 @@ RUN apt update -y && \
 
 # Install emscripten
 ENV EMSDK_DIR=/usr/emsdk
-ENV EMSDK_VER=3.1.50
+ENV EMSDK_VER=4.0.7
 ENV PATH=$EMSDK_DIR/upstream/emscripten:$PATH
 RUN git clone https://github.com/emscripten-core/emsdk.git $EMSDK_DIR && \
     $EMSDK_DIR/emsdk install $EMSDK_VER && \

skiko/gradle.properties

@@ -7,7 +7,7 @@ kotlin.mpp.enableCInteropCommonization=true
 deploy.version=0.0.0
 
 # a tag from https://github.com/JetBrains/skia-pack
-dependencies.skia=m138-80d088a-2
+dependencies.skia=m144-e2e6623374-2
 
 # a tag from https://github.com/JetBrains/angle-pack
 dependencies.angle=ec4d8f8e4d

skiko/src/commonMain/cpp/common/FontMgrDefaultFactory.cc

@@ -11,10 +11,12 @@
 
 #if (defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_LINUX)) && !defined(SKIKO_WASM)
 #include "ports/SkFontMgr_fontconfig.h"
+#include "ports/SkFontScanner_FreeType.h"
 #endif
 
 #ifdef SK_BUILD_FOR_ANDROID
 #include "ports/SkFontMgr_android.h"
+#include "ports/SkFontScanner_FreeType.h"
 #endif
 
 #ifdef SKIKO_WASM
@@ -36,11 +38,11 @@ sk_sp<SkFontMgr> SkFontMgrSkikoDefault() {
 #endif
 
 #if (defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_LINUX)) && !defined(SKIKO_WASM)
-    return SkFontMgr_New_FontConfig(nullptr);
+    return SkFontMgr_New_FontConfig(nullptr, SkFontScanner_Make_FreeType());
 #endif
 
 #ifdef SK_BUILD_FOR_ANDROID
-    return SkFontMgr_New_Android(nullptr);
+    return SkFontMgr_New_Android(nullptr, SkFontScanner_Make_FreeType());
 #endif
 
 #ifdef SKIKO_WASM

skiko/src/commonMain/cpp/common/mppinterop.cc

@@ -49,7 +49,7 @@ namespace skikoMpp {
                 if (run.fGlyphCount > 1 && SkScalarNearlyEqual(posBuffer[(run.fGlyphCount - 2) * 2], lastLeft))
                     lastWidth = 0;
                 else
-                    font.getWidths(&run.fGlyphIndices[run.fGlyphCount - 1], 1, &lastWidth);
+                    font.getWidths({&run.fGlyphIndices[run.fGlyphCount - 1], 1}, {&lastWidth, 1});
 
                 auto runBounds = SkRect::MakeLTRB(posBuffer[0], posBuffer[1] + metrics.fAscent, lastLeft + lastWidth, posBuffer[1] + metrics.fDescent);
                 bounds->join(runBounds);

skiko/src/commonMain/cpp/common/node/RenderNode.cpp

@@ -1,4 +1,5 @@
 #include <SkNWayCanvas.h>
+#include <SkPathBuilder.h>
 #include <SkPicture.h>
 #include <SkShadowUtils.h>
 #include "node/RenderNode.h"
@@ -306,9 +307,9 @@ void RenderNode::updateMatrix() {
 void RenderNode::drawShadow(SkCanvas *canvas, const LightGeometry& lightGeometry, const LightInfo& lightInfo) {
     SkPath tmpPath, *path = &tmpPath;
     if (this->clipRect) {
-        tmpPath.addRect(*this->clipRect);
+        tmpPath = SkPathBuilder().addRect(*this->clipRect).detach();
     } else if (this->clipRRect) {
-        tmpPath.addRRect(*this->clipRRect);
+        tmpPath = SkPathBuilder().addRRect(*this->clipRRect).detach();
     } else if (this->clipPath) {
         path = &*this->clipPath;
     } else {