feat: chrome/m125

Brooooooklyn · Apr 17, 2024 · e58e642 · e58e642
1 parent a54cd33
commit e58e642
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/README-zh.md b/README-zh.md
@@ -1,7 +1,7 @@
 # `skr canvas`
 
 ![CI](https://github.com/Brooooooklyn/canvas/workflows/CI/badge.svg)
-![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm123-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm125-hotpink)
 [![install size](https://packagephobia.com/badge?p=@napi-rs/canvas)](https://packagephobia.com/result?p=@napi-rs/canvas)
 [![Downloads](https://img.shields.io/npm/dm/@napi-rs/canvas.svg?sanitize=true)](https://npmcharts.com/compare/@napi-rs/canvas?minimal=true)
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # `skr canvas`
 
 ![CI](https://github.com/Brooooooklyn/canvas/workflows/CI/badge.svg)
-![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm123-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm125-hotpink)
 [![install size](https://packagephobia.com/badge?p=@napi-rs/canvas)](https://packagephobia.com/result?p=@napi-rs/canvas)
 [![Downloads](https://img.shields.io/npm/dm/@napi-rs/canvas.svg?sanitize=true)](https://npmcharts.com/compare/@napi-rs/canvas?minimal=true)
 

diff --git a/scripts/build-skia.js b/scripts/build-skia.js
@@ -59,7 +59,6 @@ const GN_ARGS = [
   `skia_use_gl=false`,
   `skia_use_harfbuzz=true`,
   `skia_use_icu=true`,
-  `skia_use_sfntly=false`,
   `skia_use_libheif=true`,
   `skia_use_libjpeg_turbo_decode=true`,
   `skia_use_libjpeg_turbo_encode=true`,
@@ -83,6 +82,7 @@ const GN_ARGS = [
   `skia_enable_fontmgr_custom_embedded=false`,
   `skia_enable_fontmgr_custom_empty=true`,
   `skia_enable_fontmgr_android=false`,
+  `skunicode_tests_enabled=false`
 ]
 
 switch (PLATFORM_NAME) {

diff --git a/scripts/release-skia-binary.js b/scripts/release-skia-binary.js
@@ -18,7 +18,7 @@ if (TARGET && TARGET.startsWith('--target=')) {
   TARGET_TRIPLE = TARGET.replace('--target=', '')
 }
 
-const LIB = ['skia', 'skparagraph', 'skshaper', 'svg', 'skunicode']
+const LIB = ['skia', 'skparagraph', 'skshaper', 'svg', 'skunicode_core', 'skunicode_icu']
 const ICU_DAT = 'icudtl.dat'
 
 const CLIENT = new Octokit({

diff --git a/skia b/skia
diff --git a/skia-c/skia_c.cpp b/skia-c/skia_c.cpp
@@ -441,7 +441,7 @@ extern "C"
     paragraph_style.setTextStyle(text_style);
     paragraph_style.setTextDirection(text_direction);
     paragraph_style.setStrutStyle(struct_style);
-    ParagraphBuilderImpl builder(paragraph_style, font_collection, SkUnicode::Make());
+    ParagraphBuilderImpl builder(paragraph_style, font_collection, SkUnicodes::ICU::Make());
     builder.addText(text, text_len);
     auto paragraph = static_cast<ParagraphImpl *>(builder.Build().release());
     paragraph->layout(MAX_LAYOUT_WIDTH);

diff --git a/skia-c/skia_c.hpp b/skia-c/skia_c.hpp
@@ -40,6 +40,7 @@
 #include <modules/skparagraph/src/ParagraphBuilderImpl.h>
 #include <modules/skparagraph/src/ParagraphImpl.h>
 #include <modules/skparagraph/include/TypefaceFontProvider.h>
+#include <modules/skunicode/include/SkUnicode_icu.h>
 #include <modules/svg/include/SkSVGDOM.h>
 #include <modules/svg/include/SkSVGSVG.h>
 #include <modules/svg/include/SkSVGNode.h>

diff --git a/src/sk.rs b/src/sk.rs
@@ -238,12 +238,19 @@ pub mod ffi {
   )]
   #[link(name = "skparagraph", kind = "static", cfg(target_os = "windows"))]
   #[link(
-    name = "skunicode",
+    name = "skunicode_core",
     kind = "static",
     modifiers = "+bundle,+whole-archive",
     cfg(not(target_os = "windows"))
   )]
-  #[link(name = "skunicode", kind = "static", cfg(target_os = "windows"))]
+  #[link(name = "skunicode_core", kind = "static", cfg(target_os = "windows"))]
+  #[link(
+    name = "skunicode_icu",
+    kind = "static",
+    modifiers = "+bundle,+whole-archive",
+    cfg(not(target_os = "windows"))
+  )]
+  #[link(name = "skunicode_icu", kind = "static", cfg(target_os = "windows"))]
   #[link(
     name = "skia",
     kind = "static",