feat: chrome/m123 (#790)

Brooooooklyn · Feb 22, 2024 · a70a8d4 · a70a8d4
1 parent 3245ff6
commit a70a8d4
Show file tree

Hide file tree

Showing 87 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - name: Install
@@ -161,7 +161,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - name: Set up QEMU
@@ -619,7 +619,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - name: Install
@@ -680,7 +680,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - name: Install dependencies

diff --git a/.github/workflows/skia.yaml b/.github/workflows/skia.yaml
@@ -35,7 +35,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - uses: actions/setup-python@v5
@@ -117,7 +117,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - uses: actions/setup-python@v5
@@ -162,7 +162,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - name: Login to GitHub Container Registry
@@ -191,7 +191,7 @@ jobs:
   build-aarch64-linux-gnu:
     if: "!contains(github.event.head_commit.message, 'skip skia')"
 
-    name: stable - aarch64-linux - build skia
+    name: stable - aarch64-linux-gnu - build skia
     runs-on: ubuntu-latest
 
     steps:
@@ -202,7 +202,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - uses: actions/setup-python@v5
@@ -242,7 +242,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - name: Login to GitHub Container Registry
@@ -282,7 +282,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - uses: actions/setup-python@v5
@@ -306,10 +306,10 @@ jobs:
       - name: Install cross compile tools
         run: |
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | sudo tee -a /etc/apt/sources.list > /dev/null
-          echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | sudo tee -a /etc/apt/sources.list > /dev/null
+          echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" | sudo tee -a /etc/apt/sources.list > /dev/null
+          echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" | sudo tee -a /etc/apt/sources.list > /dev/null
           sudo apt-get update
-          sudo apt-get install llvm-16 clang-16 lld-16 gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y
+          sudo apt-get install llvm-18 clang-18 lld-18 gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
           docker buildx build --load --platform linux/arm/v7 -t ubuntu:jammy-armv7 . -f jammy-armv7.Dockerfile
           docker run --rm -dt --name ubuntu-jammy-armv7 ubuntu:jammy-armv7
@@ -343,7 +343,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - uses: actions/setup-python@v5

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%2Fm122-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm123-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%2Fm122-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm123-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/__test__/regression.spec.ts b/__test__/regression.spec.ts
@@ -188,7 +188,7 @@ test('draw-svg-with-text', async (t) => {
   const Arrow = new Image()
   Arrow.src = await fs.readFile(join(__dirname, 'image-og.svg'))
   ctx.drawImage(Arrow, 80, 60)
-  await snapshotImage(t, { ctx, canvas }, 'png', process.arch === 'x64' && process.platform !== 'darwin' ? 0.015 : 0.3)
+  await snapshotImage(t, { ctx, canvas }, 'png', process.arch === 'x64' && process.platform !== 'darwin' ? 0.15 : 0.3)
 })
 
 test('DOMMatrix::transformPoint', (t) => {

diff --git a/__test__/snapshots/arc.png b/__test__/snapshots/arc.png
diff --git a/__test__/snapshots/arcTo-colorful.png b/__test__/snapshots/arcTo-colorful.png
diff --git a/__test__/snapshots/arcTo.png b/__test__/snapshots/arcTo.png
diff --git a/__test__/snapshots/beginPath.png b/__test__/snapshots/beginPath.png
diff --git a/__test__/snapshots/bezierCurveTo-colorful.png b/__test__/snapshots/bezierCurveTo-colorful.png
diff --git a/__test__/snapshots/bezierCurveTo.png b/__test__/snapshots/bezierCurveTo.png
diff --git a/__test__/snapshots/clearRect.png b/__test__/snapshots/clearRect.png
diff --git a/__test__/snapshots/clip.png b/__test__/snapshots/clip.png
diff --git a/__test__/snapshots/closePath-arc.png b/__test__/snapshots/closePath-arc.png
diff --git a/__test__/snapshots/closePath.png b/__test__/snapshots/closePath.png
diff --git a/__test__/snapshots/composition-destination-in.png b/__test__/snapshots/composition-destination-in.png
diff --git a/__test__/snapshots/composition-source-in.png b/__test__/snapshots/composition-source-in.png
diff --git a/__test__/snapshots/createConicGradient.png b/__test__/snapshots/createConicGradient.png
diff --git a/__test__/snapshots/createPattern-no-transform-imagedata.png b/__test__/snapshots/createPattern-no-transform-imagedata.png
diff --git a/__test__/snapshots/createPattern-no-transform.png b/__test__/snapshots/createPattern-no-transform.png
diff --git a/__test__/snapshots/createPattern-with-transform.png b/__test__/snapshots/createPattern-with-transform.png
diff --git a/__test__/snapshots/createRadialGradient.png b/__test__/snapshots/createRadialGradient.png
diff --git a/__test__/snapshots/draw-image-svg-noto-emoji.png b/__test__/snapshots/draw-image-svg-noto-emoji.png
diff --git a/__test__/snapshots/draw-svg-with-text.png b/__test__/snapshots/draw-svg-with-text.png
diff --git a/__test__/snapshots/draw-text-center-maxWidth.png b/__test__/snapshots/draw-text-center-maxWidth.png
diff --git a/__test__/snapshots/draw-text-maxWidth.png b/__test__/snapshots/draw-text-maxWidth.png
diff --git a/__test__/snapshots/draw-text-right-maxWidth.png b/__test__/snapshots/draw-text-right-maxWidth.png
diff --git a/__test__/snapshots/drawImage-another-Canvas.png b/__test__/snapshots/drawImage-another-Canvas.png
diff --git a/__test__/snapshots/drawImage-svg-resize.png b/__test__/snapshots/drawImage-svg-resize.png
diff --git a/__test__/snapshots/drawImage.png b/__test__/snapshots/drawImage.png
diff --git a/__test__/snapshots/echarts-start.png b/__test__/snapshots/echarts-start.png
diff --git a/__test__/snapshots/ellipse.png b/__test__/snapshots/ellipse.png
diff --git a/__test__/snapshots/fill-alpha-should-not-effect-drawImage.png b/__test__/snapshots/fill-alpha-should-not-effect-drawImage.png
diff --git a/__test__/snapshots/fill.png b/__test__/snapshots/fill.png
diff --git a/__test__/snapshots/fillText-AA.png b/__test__/snapshots/fillText-AA.png
diff --git a/__test__/snapshots/fillText-COLRv1.png b/__test__/snapshots/fillText-COLRv1.png
diff --git a/__test__/snapshots/fillText-line-break-as-space.png b/__test__/snapshots/fillText-line-break-as-space.png
diff --git a/__test__/snapshots/fillText-maxWidth.png b/__test__/snapshots/fillText-maxWidth.png
diff --git a/__test__/snapshots/fillText.png b/__test__/snapshots/fillText.png
diff --git a/__test__/snapshots/filter-blur.png b/__test__/snapshots/filter-blur.png
diff --git a/__test__/snapshots/filter-brightness.png b/__test__/snapshots/filter-brightness.png
diff --git a/__test__/snapshots/filter-combine-contrast-brightness.png b/__test__/snapshots/filter-combine-contrast-brightness.png
diff --git a/__test__/snapshots/filter-contrast-ff.png b/__test__/snapshots/filter-contrast-ff.png
diff --git a/__test__/snapshots/filter-contrast.png b/__test__/snapshots/filter-contrast.png
diff --git a/__test__/snapshots/filter-drop-shadow.png b/__test__/snapshots/filter-drop-shadow.png
diff --git a/__test__/snapshots/filter-grayscale.png b/__test__/snapshots/filter-grayscale.png
diff --git a/__test__/snapshots/filter-hue-rotate.png b/__test__/snapshots/filter-hue-rotate.png
diff --git a/__test__/snapshots/filter-invert.png b/__test__/snapshots/filter-invert.png
diff --git a/__test__/snapshots/filter-opacity.png b/__test__/snapshots/filter-opacity.png
diff --git a/__test__/snapshots/filter-saturate.png b/__test__/snapshots/filter-saturate.png
diff --git a/__test__/snapshots/filter-save-restore.png b/__test__/snapshots/filter-save-restore.png
diff --git a/__test__/snapshots/filter-sepia.png b/__test__/snapshots/filter-sepia.png
diff --git a/__test__/snapshots/getImageData.png b/__test__/snapshots/getImageData.png
diff --git a/__test__/snapshots/global-alpha-should-effect-drawImage.png b/__test__/snapshots/global-alpha-should-effect-drawImage.png
diff --git a/__test__/snapshots/lineTo-with-invalid-point.png b/__test__/snapshots/lineTo-with-invalid-point.png
diff --git a/__test__/snapshots/lineTo.png b/__test__/snapshots/lineTo.png
diff --git a/__test__/snapshots/moveTo.png b/__test__/snapshots/moveTo.png
diff --git a/__test__/snapshots/quadraticCurveTo.png b/__test__/snapshots/quadraticCurveTo.png
diff --git a/__test__/snapshots/rect.png b/__test__/snapshots/rect.png
diff --git a/__test__/snapshots/resetTransform.png b/__test__/snapshots/resetTransform.png
diff --git a/__test__/snapshots/rotate.png b/__test__/snapshots/rotate.png
diff --git a/__test__/snapshots/save-restore.png b/__test__/snapshots/save-restore.png
diff --git a/__test__/snapshots/setLineDash.png b/__test__/snapshots/setLineDash.png
diff --git a/__test__/snapshots/setTransform matrix.png b/__test__/snapshots/setTransform matrix.png
diff --git a/__test__/snapshots/setTransform.png b/__test__/snapshots/setTransform.png
diff --git a/__test__/snapshots/shadowOffsetX.png b/__test__/snapshots/shadowOffsetX.png
diff --git a/__test__/snapshots/shadowOffsetY.png b/__test__/snapshots/shadowOffsetY.png
diff --git a/__test__/snapshots/stroke.png b/__test__/snapshots/stroke.png
diff --git a/__test__/snapshots/strokeRect.png b/__test__/snapshots/strokeRect.png
diff --git a/__test__/snapshots/strokeRoundRect.png b/__test__/snapshots/strokeRoundRect.png
diff --git a/__test__/snapshots/strokeText-line-break-as-space.png b/__test__/snapshots/strokeText-line-break-as-space.png
diff --git a/__test__/snapshots/strokeText.png b/__test__/snapshots/strokeText.png
diff --git a/__test__/snapshots/svg-transparent-background.png b/__test__/snapshots/svg-transparent-background.png
diff --git a/__test__/snapshots/text-align-center.png b/__test__/snapshots/text-align-center.png
diff --git a/__test__/snapshots/text-align-end.png b/__test__/snapshots/text-align-end.png
diff --git a/__test__/snapshots/text-align-left.png b/__test__/snapshots/text-align-left.png
diff --git a/__test__/snapshots/text-align-right.png b/__test__/snapshots/text-align-right.png
diff --git a/__test__/snapshots/text-align-start.png b/__test__/snapshots/text-align-start.png
diff --git a/__test__/snapshots/text-align-with-space.png b/__test__/snapshots/text-align-with-space.png
diff --git a/__test__/snapshots/text-baseline-all.png b/__test__/snapshots/text-baseline-all.png
diff --git a/__test__/snapshots/text-baseline.png b/__test__/snapshots/text-baseline.png
diff --git a/__test__/snapshots/transform-with-radial-gradient-x.png b/__test__/snapshots/transform-with-radial-gradient-x.png
diff --git a/__test__/snapshots/transform-with-radial-gradient.png b/__test__/snapshots/transform-with-radial-gradient.png
diff --git a/__test__/snapshots/transform.png b/__test__/snapshots/transform.png
diff --git a/build.rs b/build.rs
@@ -166,14 +166,14 @@ fn main() {
                 "/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/usr/include",
               )
               .flag("--sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot");
-            println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/lib/llvm-16/lib");
+            println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/lib/llvm-18/lib");
             println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/lib");
             println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/lib");
             println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5");
           }
           "x86_64" => {
-            build.include("/usr/lib/llvm-16/include/c++/v1");
-            println!("cargo:rustc-link-search=/usr/lib/llvm-16/lib");
+            build.include("/usr/lib/llvm-18/include/c++/v1");
+            println!("cargo:rustc-link-search=/usr/lib/llvm-18/lib");
           }
           "arm" => {
             let gcc_version = String::from_utf8(

diff --git a/scripts/build-skia.js b/scripts/build-skia.js
@@ -133,7 +133,7 @@ switch (PLATFORM_NAME) {
       HOST_LIBC === 'glibc' &&
       HOST_ARCH === 'x64'
     ) {
-      ExtraCflagsCC += ',"-stdlib=libc++","-static","-I/usr/lib/llvm-16/include/c++/v1"'
+      ExtraCflagsCC += ',"-stdlib=libc++","-static","-I/usr/lib/llvm-18/include/c++/v1"'
     }
     if (PLATFORM_NAME === 'linux' && (!TARGET_TRIPLE || TARGET_TRIPLE.startsWith('x86_64'))) {
       ExtraCflagsCC += ',"-Wno-psabi"'
@@ -149,14 +149,14 @@ switch (TARGET_TRIPLE) {
     ExtraCflags =
       '"--target=aarch64-unknown-linux-gnu", "--sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot", "-I/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/usr/include", "-march=armv8-a"'
     ExtraCflagsCC +=
-      ', "--target=aarch64-unknown-linux-gnu", "--sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot", "-I/usr/lib/llvm-16/include/c++/v1", "-I/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/usr/include", "-march=armv8-a"'
+      ', "--target=aarch64-unknown-linux-gnu", "--sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot", "-I/usr/lib/llvm-18/include/c++/v1", "-I/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/usr/include", "-march=armv8-a"'
     ExtraLdFlags =
-      '"-fuse-ld=lld", "-L/usr/aarch64-unknown-linux-gnu/lib/llvm-16/lib", "-L/usr/aarch64-unknown-linux-gnu/lib", "-L/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/lib", "-L/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5"'
+      '"-fuse-ld=lld", "-L/usr/aarch64-unknown-linux-gnu/lib/llvm-18/lib", "-L/usr/aarch64-unknown-linux-gnu/lib", "-L/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/lib", "-L/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5"'
     ExtraAsmFlags = '"--target=aarch64-unknown-linux-gnu", "-march=armv8-a"'
 
     GN_ARGS.push(
       `extra_ldflags=[${ExtraLdFlags}]`,
-      `ar="llvm-ar-16"`,
+      `ar="llvm-ar-18"`,
       `extra_asmflags=[${ExtraAsmFlags}]`,
       `extra_cflags=[${ExtraCflags}]`,
       `extra_cflags_c=[${ExtraCflags}]`,
@@ -189,7 +189,7 @@ switch (TARGET_TRIPLE) {
 
     GN_ARGS.push(
       `extra_ldflags=[${ExtraLdFlags}]`,
-      `ar="llvm-ar-16"`,
+      `ar="llvm-ar-18"`,
       `extra_asmflags=[${ExtraAsmFlags}]`,
       `extra_cflags=[${ExtraCflags}]`,
       `extra_cflags_c=[${ExtraCflags}]`,

diff --git a/skia b/skia