feat: chrome/m94

Brooooooklyn · Aug 24, 2021 · 887a950 · 887a950 · github-actions · Aug 24, 2021
1 parent 0fb3563
commit 887a950
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 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%2Fm93-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm94-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%2Fm93-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm94-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/build.rs b/build.rs
@@ -191,6 +191,7 @@ fn main() {
     println!("cargo:rustc-link-lib=static=skiac");
     println!("cargo:rustc-link-lib=skparagraph");
     println!("cargo:rustc-link-lib=skshaper");
+    println!("cargo:rustc-link-lib=static=skunicode");
   }
 
   #[cfg(not(target_os = "linux"))]
@@ -200,6 +201,7 @@ fn main() {
     println!("cargo:rustc-link-lib=skiac");
     println!("cargo:rustc-link-lib=skparagraph");
     println!("cargo:rustc-link-lib=skshaper");
+    println!("cargo:rustc-link-lib=skunicode");
   }
   napi_build::setup();
 }
diff --git a/scripts/build-skia.js b/scripts/build-skia.js
@@ -1,4 +1,5 @@
 const { execSync } = require('child_process')
+const { readFileSync, writeFileSync } = require('fs')
 const path = require('path')
 const { platform } = require('os')
 
@@ -203,6 +204,19 @@ const OUTPUT_PATH = path.join('out', 'Static')
 
 GN_ARGS.push(`cc=${CC}`, `cxx=${CXX}`, `extra_cflags_cc=[${ExtraCflagsCC}]`, ExtraSkiaBuildFlag)
 
+const SkLoadICUCppFilePath = path.join(__dirname, '..', 'skia', 'third_party', 'icu', 'SkLoadICU.cpp')
+const CODE_TO_PATCH = 'good = load_from(executable_directory()) || load_from(library_directory());'
+const CODE_I_WANT = 'good = load_from(library_directory()) || load_from(executable_directory());'
+
+if (PLATFORM_NAME === 'win32') {
+  const content = readFileSync(SkLoadICUCppFilePath, 'utf8')
+  const patch = content.replace(CODE_TO_PATCH, CODE_I_WANT)
+  writeFileSync(SkLoadICUCppFilePath, patch)
+  process.once('beforeExit', () => {
+    writeFileSync(SkLoadICUCppFilePath, content)
+  })
+}
+
 exec(
   `${process.env.GN_EXE ? process.env.GN_EXE : path.join('bin', 'gn')} gen ${OUTPUT_PATH} --args='${GN_ARGS.join(
     ' ',

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', 'sktext']
+const LIB = ['skia', 'skparagraph', 'skshaper', 'svg', 'sktext', 'skunicode']
 const ICU_DAT = 'icudtl.dat'
 
 const CLIENT = new Octokit({

diff --git a/skia b/skia
Benchmark suite	Current: `887a950`	Previous: `0fb3563`	Ratio
`Draw house#skia-canvas`	`20` ops/sec (`±1.33%`)	`19.5` ops/sec (`±1.23%`)	`0.97`
`Draw house#node-canvas`	`22` ops/sec (`±1%`)	`20.2` ops/sec (`±0.88%`)	`0.92`
`Draw house#@napi-rs/skia`	`23` ops/sec (`±1.15%`)	`19.4` ops/sec (`±1.14%`)	`0.84`
`Draw gradient#skia-canvas`	`19` ops/sec (`±0.55%`)	`18.8` ops/sec (`±1.71%`)	`0.99`
`Draw gradient#node-canvas`	`21` ops/sec (`±1.04%`)	`18.9` ops/sec (`±1.7%`)	`0.90`
`Draw gradient#@napi-rs/skia`	`22` ops/sec (`±0.86%`)	`18.1` ops/sec (`±2%`)	`0.82`