[skia-sync] Merge upstream chrome/m152

.disabled.go.mod

@@ -12,7 +12,8 @@ require (
 	github.com/trietmn/go-wiki v1.0.1
 	github.com/vektra/mockery/v2 v2.52.2
 	go.chromium.org/luci v0.0.0-20251208084510-e9565e513ef0
-	go.skia.org/infra v0.0.0-20260626171410-c0e4e8a0a6bd
+	go.skia.org/infra v0.0.0-20260723151640-d47334d0785d
+	golang.org/x/oauth2 v0.30.0
 	google.golang.org/api v0.248.0
 	google.golang.org/protobuf v1.36.10
 )
@@ -140,7 +141,6 @@ require (
 	golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
 	golang.org/x/mod v0.27.0 // indirect
 	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
 	golang.org/x/sys v0.35.0 // indirect
 	golang.org/x/term v0.34.0 // indirect

.disabled.go.sum

@@ -344,8 +344,8 @@ go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFh
 go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
 go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
 go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
-go.skia.org/infra v0.0.0-20260626171410-c0e4e8a0a6bd h1:sH4D9hGdYPYg/euwa2nMUEqf9+o+drX9ggXeCVvrXqA=
-go.skia.org/infra v0.0.0-20260626171410-c0e4e8a0a6bd/go.mod h1:IN8jdFPrIDrbWzJuEezIB11r3fTYzUaXSghv98C9/AM=
+go.skia.org/infra v0.0.0-20260723151640-d47334d0785d h1:1TXIrBN0yb/Fk3cqVbMapUMfeY+4ulwb7slPXTRcDnk=
+go.skia.org/infra v0.0.0-20260723151640-d47334d0785d/go.mod h1:UnvP4XqoBuJ0XkO7YhnU+EX7t3bzhfu4Gj8y1G0SN1o=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

AUTHORS

@@ -116,6 +116,7 @@ Thiago Fransosi Farina <thiago.farina@gmail.com>
 Thirumurugan <thiruak1024@gmail.com>
 Tyler Denniston <denniston.t@gmail.com>
 Vibe Inc <*@vibe.us>
+Wenting Shi <wenting_shi@apple.com>
 William Candillon <wcandillon@gmail.com>
 Wonmin Park <satcom1600@hanmail.net>
 Yandex LLC <*@yandex-team.ru>

BUILD.bazel

@@ -91,7 +91,13 @@ alias(
 
 alias(
     name = "ganesh_vulkan",
-    actual = "//src/gpu/ganesh/vk:ganesh_vulkan_novma",
+    actual = "//src/gpu/ganesh/vk:ganesh_vulkan",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "ganesh_d3d",
+    actual = "//src/gpu/ganesh/d3d:ganesh_d3d",
     visibility = ["//visibility:public"],
 )
 
@@ -117,6 +123,12 @@ alias(
     visibility = ["//visibility:public"],
 )
 
+alias(
+    name = "bmp_decode_rust",
+    actual = "//src/codec:rust_bmp_decoder",
+    visibility = ["//visibility:public"],
+)
+
 alias(
     name = "gif_decode_codec",
     actual = "//src/codec:gif_decode",
@@ -253,6 +265,12 @@ alias(
     visibility = ["//visibility:public"],
 )
 
+alias(
+    name = "fontmgr_win_dw",
+    actual = "//src/ports:fontmgr_win_dw",
+    visibility = ["//visibility:public"],
+)
+
 alias(
     name = "typeface_coretext",
     actual = "//src/ports:coretext_typeface",

BUILD.gn

@@ -907,7 +907,7 @@ optional("gpu_shared") {
   enabled = skia_enable_ganesh || skia_enable_graphite
 
   configs = []
-  deps = []
+  deps = [ ":core" ]
   libs = []
   public_defines = []
   public_deps = []
@@ -1145,7 +1145,10 @@ optional("jpeg_encode") {
   enabled = skia_use_libjpeg_turbo_encode && !skia_use_ndk_images
   public_defines = [ "SK_CODEC_ENCODES_JPEG" ]
 
-  deps = [ "//third_party/libjpeg-turbo:libjpeg" ]
+  deps = [
+    ":core",
+    "//third_party/libjpeg-turbo:libjpeg",
+  ]
   public = skia_encode_jpeg_public
   sources = skia_encode_jpeg_srcs
 
@@ -1183,6 +1186,7 @@ optional("graphite") {
 
   enabled = skia_enable_graphite
   deps = [
+    ":core",
     ":gpu_shared",
     ":vello",
   ]
@@ -1393,18 +1397,19 @@ if (is_debug) {
 # from having multiple copies of the Rust standard library.
 
 if (skia_use_fontations || skia_use_rust_png_decode ||
-    skia_use_rust_png_encode || skia_use_rust_bmp_decode || skia_use_rust_icc ||
-    skia_use_rust_exif) {
+    skia_use_rust_png_encode || skia_use_rust_bmp_decode ||
+    skia_use_rust_ico_decode || skia_use_rust_icc || skia_use_rust_exif) {
   # Collect all Rust targets, sources, outputs based on what's enabled
   _rust_targets = []
   _rust_sources = []
   _rust_outputs = []
   _rust_output_mappings = []
 
   # Add cxx dependency if any feature that needs it is enabled
-  _needs_cxx = skia_use_fontations || skia_use_rust_png_decode ||
-               skia_use_rust_png_encode || skia_use_rust_bmp_decode ||
-               skia_use_rust_icc || skia_use_rust_exif
+  _needs_cxx =
+      skia_use_fontations || skia_use_rust_png_decode ||
+      skia_use_rust_png_encode || skia_use_rust_bmp_decode ||
+      skia_use_rust_ico_decode || skia_use_rust_icc || skia_use_rust_exif
   if (_needs_cxx) {
     _rust_targets += [ "@crates//:cxx_cc" ]
     _rust_sources += [
@@ -1477,23 +1482,44 @@ if (skia_use_fontations || skia_use_rust_png_decode ||
   }
 
   if (skia_use_rust_bmp_decode) {
-    _rust_targets += [ "//experimental/rust_bmp/ffi:ffi_rs" ]
+    _rust_targets += [ "//rust/bmp:ffi_rs" ]
     _rust_sources += [
-      "experimental/rust_bmp/ffi/BUILD.bazel",
-      "experimental/rust_bmp/ffi/FFI.rs",
+      "rust/bmp/BUILD.bazel",
+      "rust/bmp/FFI.rs",
     ]
     _rust_outputs += [
       "$root_out_dir/librust_bmp_ffi_rs.a",
-      "$root_out_dir/experimental/rust_bmp/ffi/FFI.rs.h",
-      "$root_out_dir/experimental/rust_bmp/ffi/FFI.rs.cc",
+      "$root_out_dir/rust/bmp/FFI.rs.h",
+      "$root_out_dir/rust/bmp/FFI.rs.cc",
     ]
     _rust_output_mappings += [
-      rebase_path("//bazel-bin/experimental/rust_bmp/ffi/libffi_rs.a",
-                  root_build_dir) + "=librust_bmp_ffi_rs.a",
-      rebase_path("//bazel-bin/experimental/rust_bmp/ffi/FFI.rs.h",
-                  root_build_dir) + "=experimental/rust_bmp/ffi/FFI.rs.h",
-      rebase_path("//bazel-bin/experimental/rust_bmp/ffi/FFI.rs.cc",
-                  root_build_dir) + "=experimental/rust_bmp/ffi/FFI.rs.cc",
+      rebase_path("//bazel-bin/rust/bmp/libffi_rs.a", root_build_dir) +
+          "=librust_bmp_ffi_rs.a",
+      rebase_path("//bazel-bin/rust/bmp/FFI.rs.h", root_build_dir) +
+          "=rust/bmp/FFI.rs.h",
+      rebase_path("//bazel-bin/rust/bmp/FFI.rs.cc", root_build_dir) +
+          "=rust/bmp/FFI.rs.cc",
+    ]
+  }
+
+  if (skia_use_rust_ico_decode) {
+    _rust_targets += [ "//experimental/rust_ico/ffi:ffi_rs" ]
+    _rust_sources += [
+      "experimental/rust_ico/ffi/BUILD.bazel",
+      "experimental/rust_ico/ffi/FFI.rs",
+    ]
+    _rust_outputs += [
+      "$root_out_dir/librust_ico_ffi_rs.a",
+      "$root_out_dir/experimental/rust_ico/ffi/FFI.rs.h",
+      "$root_out_dir/experimental/rust_ico/ffi/FFI.rs.cc",
+    ]
+    _rust_output_mappings += [
+      rebase_path("//bazel-bin/experimental/rust_ico/ffi/libffi_rs.a",
+                  root_build_dir) + "=librust_ico_ffi_rs.a",
+      rebase_path("//bazel-bin/experimental/rust_ico/ffi/FFI.rs.h",
+                  root_build_dir) + "=experimental/rust_ico/ffi/FFI.rs.h",
+      rebase_path("//bazel-bin/experimental/rust_ico/ffi/FFI.rs.cc",
+                  root_build_dir) + "=experimental/rust_ico/ffi/FFI.rs.cc",
     ]
   }
 
@@ -1567,6 +1593,9 @@ if (skia_use_fontations || skia_use_rust_png_decode ||
     if (skia_use_rust_bmp_decode) {
       _all_rust_libs += [ "$root_out_dir/librust_bmp_ffi_rs.a" ]
     }
+    if (skia_use_rust_ico_decode) {
+      _all_rust_libs += [ "$root_out_dir/librust_ico_ffi_rs.a" ]
+    }
     if (skia_use_rust_icc) {
       _all_rust_libs += [ "$root_out_dir/librust_icc_ffi_rs.a" ]
     }
@@ -1592,6 +1621,9 @@ if (skia_use_fontations || skia_use_rust_png_decode ||
     if (skia_use_rust_bmp_decode) {
       _all_rust_libs += [ "$root_out_dir/librust_bmp_ffi_rs.a" ]
     }
+    if (skia_use_rust_ico_decode) {
+      _all_rust_libs += [ "$root_out_dir/librust_ico_ffi_rs.a" ]
+    }
     if (skia_use_rust_icc) {
       _all_rust_libs += [ "$root_out_dir/librust_icc_ffi_rs.a" ]
     }
@@ -1699,7 +1731,8 @@ config("rust_common_cxx_bridge_public_config") {
 }
 
 optional("rust_common") {
-  enabled = skia_use_rust_png_decode || skia_use_rust_png_encode
+  enabled = skia_use_rust_png_decode || skia_use_rust_png_encode ||
+            skia_use_rust_bmp_decode
   public_defines = []
   if (skia_use_rust_png_for_android) {
     public_defines += [ "SK_CODEC_USES_PNG_WITH_RUST_FOR_ANDROID" ]
@@ -1762,6 +1795,9 @@ optional("png_decode_rust") {
   sources = skia_codec_rust_png
   sources_for_tests = [ "tests/SkPngRustDecoderTest.cpp" ]
 
+  # The public header pulls in `rust/png/FFI.rs.h`, so dependents need the cxx
+  # bridge's include path (`$root_out_dir`) on their compile line.
+  public_configs = [ ":rust_common_cxx_bridge_public_config" ]
   deps = [
     ":png_decode_common",
     ":rust_common",
@@ -1787,35 +1823,64 @@ optional("png_encode_rust") {
 }
 
 if (skia_use_rust_bmp_decode) {
-  config("rust_bmp_cxx_bridge_public_config") {
-    include_dirs = [ "$root_out_dir" ]
-  }
   config("rust_bmp_cxx_bridge_private_config") {
     include_dirs = [ "." ]
   }
   skia_source_set("rust_bmp_cxx_bridge") {
     deps = [ ":rust_all_ffi_bazel_build" ]
-    public = [ "${root_out_dir}/experimental/rust_bmp/ffi/FFI.rs.h" ]
-    sources = [ "${root_out_dir}/experimental/rust_bmp/ffi/FFI.rs.cc" ]
-    public_configs = [ ":rust_bmp_cxx_bridge_public_config" ]
+    public = [ "${root_out_dir}/rust/bmp/FFI.rs.h" ]
+    sources = [ "${root_out_dir}/rust/bmp/FFI.rs.cc" ]
+    public_configs = [ ":rust_common_cxx_bridge_public_config" ]
     configs = [ ":rust_bmp_cxx_bridge_private_config" ]
   }
 }
 
 optional("bmp_decode_rust") {
   public_defines = [ "SK_CODEC_DECODES_BMP_WITH_RUST" ]
   enabled = skia_use_rust_bmp_decode
-  public = [ "experimental/rust_bmp/decoder/SkBmpRustDecoder.h" ]
-  sources = [
-    "experimental/rust_bmp/decoder/SkBmpRustDecoder.cpp",
-    "experimental/rust_bmp/decoder/SkBmpRustDecoder.h",
-    "experimental/rust_bmp/decoder/impl/SkBmpRustCodec.cpp",
-    "experimental/rust_bmp/decoder/impl/SkBmpRustCodec.h",
-  ]
+  public = skia_codec_rust_bmp_public
+  sources = skia_codec_rust_bmp
   sources_for_tests = [ "tests/SkBmpRustDecoderTest.cpp" ]
   deps = [
     ":rust_bmp_cxx_bridge",
+    ":rust_common",
+    ":rust_ffi_libs",
+  ]
+  libs = [ "c++" ]
+}
+
+if (skia_use_rust_ico_decode) {
+  config("rust_ico_cxx_bridge_public_config") {
+    include_dirs = [ "$root_out_dir" ]
+  }
+  config("rust_ico_cxx_bridge_private_config") {
+    include_dirs = [ "." ]
+  }
+  skia_source_set("rust_ico_cxx_bridge") {
+    deps = [ ":rust_all_ffi_bazel_build" ]
+    public = [ "${root_out_dir}/experimental/rust_ico/ffi/FFI.rs.h" ]
+    sources = [ "${root_out_dir}/experimental/rust_ico/ffi/FFI.rs.cc" ]
+    public_configs = [ ":rust_ico_cxx_bridge_public_config" ]
+    configs = [ ":rust_ico_cxx_bridge_private_config" ]
+  }
+}
+
+optional("ico_decode_rust") {
+  public_defines = [ "SK_CODEC_DECODES_ICO_WITH_RUST" ]
+  enabled = skia_use_rust_ico_decode
+  public = [ "experimental/rust_ico/decoder/SkIcoRustDecoder.h" ]
+  sources = [
+    "experimental/rust_ico/decoder/SkIcoRustDecoder.cpp",
+    "experimental/rust_ico/decoder/SkIcoRustDecoder.h",
+    "experimental/rust_ico/decoder/impl/SkIcoRustCodec.cpp",
+    "experimental/rust_ico/decoder/impl/SkIcoRustCodec.h",
+  ]
+  sources_for_tests = [ "tests/SkIcoRustDecoderTest.cpp" ]
+  deps = [
+    ":bmp_decode_rust",
+    ":png_decode_rust",
     ":rust_ffi_libs",
+    ":rust_ico_cxx_bridge",
   ]
   libs = [ "c++" ]
 }
@@ -1833,7 +1898,10 @@ optional("webp_encode") {
   public_defines = [ "SK_CODEC_ENCODES_WEBP" ]
   public = skia_encode_webp_public
 
-  deps = [ "//third_party/libwebp" ]
+  deps = [
+    ":core",
+    "//third_party/libwebp",
+  ]
   sources = skia_encode_webp_srcs
 }
 
@@ -1844,15 +1912,21 @@ optional("wuffs") {
     "SK_CODEC_DECODES_GIF",
   ]
 
-  deps = [ "//third_party/wuffs" ]
+  deps = [
+    ":core",
+    "//third_party/wuffs",
+  ]
   sources = [ "src/codec/SkWuffsCodec.cpp" ]
 }
 
 optional("xml") {
   enabled = skia_use_expat || skia_use_jpeg_gainmaps
   public_defines = [ "SK_XML" ]
 
-  deps = [ "//third_party/expat" ]
+  deps = [
+    ":core",
+    "//third_party/expat",
+  ]
   sources = skia_xml_sources
   sources += skia_codec_xmp
   sources += skia_svg_writer_sources
@@ -2161,12 +2235,14 @@ if (is_canvaskit) {
     public_configs = [ ":skia_public" ]
 
     sources = [
+      "tools/ProcsUtils.cpp",
       "tools/SkSharingProc.cpp",
       "tools/UrlDataManager.cpp",
       "tools/debugger/DebugCanvas.cpp",
       "tools/debugger/DebugLayerManager.cpp",
       "tools/debugger/DrawCommand.cpp",
       "tools/debugger/JsonWriteBuffer.cpp",
+      "tools/fonts/FontToolUtils.cpp",
     ]
   }
 }
@@ -2660,14 +2736,14 @@ if (skia_enable_tools) {
       "tools/AutoreleasePool.h",
       "tools/DecodeUtils.cpp",
       "tools/DecodeUtils.h",
-      "tools/DeserialProcsUtils.cpp",
-      "tools/DeserialProcsUtils.h",
       "tools/EncodeUtils.cpp",
       "tools/EncodeUtils.h",
       "tools/GpuToolUtils.h",
       "tools/LsanSuppressions.cpp",
       "tools/ProcStats.cpp",
       "tools/ProcStats.h",
+      "tools/ProcsUtils.cpp",
+      "tools/ProcsUtils.h",
       "tools/Resources.cpp",
       "tools/Resources.h",
       "tools/RuntimeBlendUtils.cpp",
@@ -2882,6 +2958,7 @@ if (skia_enable_tools) {
         ":fontmgr_fontconfig_tests",
         ":fontmgr_mac_ct_tests",
         ":fontscanner_tests",
+        ":ico_decode_rust_tests",
         ":png_decode_libpng_tests",
         ":png_decode_rust_tests",
         ":png_encode_rust_tests",
@@ -3229,6 +3306,7 @@ if (skia_enable_tools) {
         "fuzz/oss_fuzz/FuzzSkRuntimeColorFilter.cpp",
         "fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp",
         "fuzz/oss_fuzz/FuzzTextBlobDeserialize.cpp",
+        "tools/ProcsUtils.cpp",
         "tools/UrlDataManager.cpp",
         "tools/debugger/DebugCanvas.cpp",
         "tools/debugger/DebugLayerManager.cpp",