[skia-sync] Merge upstream chrome/m153 (#348)

[skia-sync] Merge upstream chrome/m153 (#348)

Requires: mono/SkiaSharp#4826
Changes: 9f0d864...168702d

Merge Google Skia chrome/m153 into the SkiaSharp fork while preserving the
fork's native ABI, dependency overrides, and upstream merge ancestry.

~~ Preserve the fork and merge ancestry ~~

Create a genuine two-parent merge from fork commit 9f0d864 and upstream
commit 9d07e5b. This ancestry is required by subsequent upstream syncs and
must not be replaced by a squash or rebase.

The merge retains the 108 C API and Xamarin fork patches. Generated P/Invoke
bindings are unchanged, no C API exports are added or removed, and
SK_C_INCREMENT remains zero. Of the 90 files in the upstream fork delta, 87
remain unchanged; only DEPS, .disabled.go.mod, and .disabled.go.sum require
adaptation.

~~ Retain native dependency authority ~~

Preserve the fork URL, revision, and enabled or commented state for every
third_party/externals dependency in DEPS. Only upstream infrastructure
metadata advances.

Accept agents/shared at e75efa5158 as an unconditional git-sync-deps checkout
used by Skia's agent configuration. It is not linked into the native GN
products. Keep agents/internal as dictionary-valued metadata excluded by the
fork dependency synchronization tool.

~~ Bound the observable behavior change ~~

Linux fontconfig matching now attempts FcFontMatch before using the sorted
fallback. This path is reachable through SkiaSharp's existing font-manager
APIs, so applications relying on the exact fallback face can observe different
font metrics or glyphs.

The Ganesh YUVA subset correction is not reachable through the current C and
managed exports. The shared Ganesh and Graphite glyph-atlas refactor changes
internal packing without changing exported layouts or signatures.

Source builds passed on Linux x64 and macOS ARM64. Independent regeneration
produced no binding diff, and the companion build completed its native,
managed, package, test, visual, and sample stages successfully.

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

Author: mattleibow

.disabled.go.mod

@@ -12,7 +12,7 @@ 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-20260723151640-d47334d0785d
+	go.skia.org/infra v0.0.0-20260814151344-57107b5a16cb
 	golang.org/x/oauth2 v0.30.0
 	google.golang.org/api v0.248.0
 	google.golang.org/protobuf v1.36.10

.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-20260723151640-d47334d0785d h1:1TXIrBN0yb/Fk3cqVbMapUMfeY+4ulwb7slPXTRcDnk=
-go.skia.org/infra v0.0.0-20260723151640-d47334d0785d/go.mod h1:UnvP4XqoBuJ0XkO7YhnU+EX7t3bzhfu4Gj8y1G0SN1o=
+go.skia.org/infra v0.0.0-20260814151344-57107b5a16cb h1:AxnBO4a3BmGCYncJHG/J2urYrBd4stDG0CPnBI4ZG8w=
+go.skia.org/infra v0.0.0-20260814151344-57107b5a16cb/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

@@ -25,6 +25,7 @@ Alexandre Mutel <alexandre_mutel@live.com>
 Amazon, Inc <*@amazon.com>
 Anthony Catel <paraboul@gmail.com>
 Andrew Kurushin <ajax16384@gmail.com>
+Ashkan Hosseini <ashkan.hoss@gmail.com>
 Bharat Ahuja <ahujabharat93@gmail.com>
 Biswapriyo Nath <nathbappai@gmail.com>
 Brian Salomon <briansalomon@gmail.com>

BUILD.gn

@@ -69,6 +69,9 @@ config("skia_public") {
   if (skia_build_fuzzers) {
     defines += [ "SK_BUILD_FOR_FUZZER" ]
   }
+  if (skia_enable_threadlocal_strikecache) {
+    defines += [ "SK_ENABLE_THREADLOCAL_STRIKECACHE" ]
+  }
 
   # Some older versions of the Clang toolchain change the visibility of
   # symbols decorated with API_AVAILABLE macro to be visible. Users of such
@@ -1398,7 +1401,8 @@ if (is_debug) {
 
 if (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) {
+    skia_use_rust_ico_decode || skia_use_rust_icc || skia_use_rust_exif ||
+    skia_use_rust_jpeg_decode || skia_use_rust_jpeg_encode) {
   # Collect all Rust targets, sources, outputs based on what's enabled
   _rust_targets = []
   _rust_sources = []
@@ -1409,7 +1413,8 @@ if (skia_use_fontations || skia_use_rust_png_decode ||
   _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
+      skia_use_rust_ico_decode || skia_use_rust_icc || skia_use_rust_exif ||
+      skia_use_rust_jpeg_decode || skia_use_rust_jpeg_encode
   if (_needs_cxx) {
     _rust_targets += [ "@crates//:cxx_cc" ]
     _rust_sources += [
@@ -1567,6 +1572,27 @@ if (skia_use_fontations || skia_use_rust_png_decode ||
     ]
   }
 
+  if (skia_use_rust_jpeg_decode || skia_use_rust_jpeg_encode) {
+    _rust_targets += [ "//experimental/rust_jpeg/ffi:ffi_rs" ]
+    _rust_sources += [
+      "experimental/rust_jpeg/ffi/BUILD.bazel",
+      "experimental/rust_jpeg/ffi/FFI.rs",
+    ]
+    _rust_outputs += [
+      "$root_out_dir/librust_jpeg_ffi_rs.a",
+      "$root_out_dir/experimental/rust_jpeg/ffi/FFI.rs.h",
+      "$root_out_dir/experimental/rust_jpeg/ffi/FFI.rs.cc",
+    ]
+    _rust_output_mappings += [
+      rebase_path("//bazel-bin/experimental/rust_jpeg/ffi/libffi_rs.a",
+                  root_build_dir) + "=librust_jpeg_ffi_rs.a",
+      rebase_path("//bazel-bin/experimental/rust_jpeg/ffi/FFI.rs.h",
+                  root_build_dir) + "=experimental/rust_jpeg/ffi/FFI.rs.h",
+      rebase_path("//bazel-bin/experimental/rust_jpeg/ffi/FFI.rs.cc",
+                  root_build_dir) + "=experimental/rust_jpeg/ffi/FFI.rs.cc",
+    ]
+  }
+
   # Single unified action that builds all Rust FFI library targets
   action("rust_all_ffi_bazel_build") {
     script = "gn/bazel_build.py"
@@ -1602,6 +1628,9 @@ if (skia_use_fontations || skia_use_rust_png_decode ||
     if (skia_use_rust_exif) {
       _all_rust_libs += [ "$root_out_dir/librust_exif_ffi_rs.a" ]
     }
+    if (skia_use_rust_jpeg_decode || skia_use_rust_jpeg_encode) {
+      _all_rust_libs += [ "$root_out_dir/librust_jpeg_ffi_rs.a" ]
+    }
 
     public_configs = [ ":rust_ffi_libs_config" ]
     all_dependent_configs = [ ":rust_ffi_libs_config" ]
@@ -1630,6 +1659,9 @@ if (skia_use_fontations || skia_use_rust_png_decode ||
     if (skia_use_rust_exif) {
       _all_rust_libs += [ "$root_out_dir/librust_exif_ffi_rs.a" ]
     }
+    if (skia_use_rust_jpeg_decode || skia_use_rust_jpeg_encode) {
+      _all_rust_libs += [ "$root_out_dir/librust_jpeg_ffi_rs.a" ]
+    }
     libs = _all_rust_libs
 
     # Allow multiple definitions because Bazel's rust_static_library includes
@@ -1885,6 +1917,54 @@ optional("ico_decode_rust") {
   libs = [ "c++" ]
 }
 
+if (skia_use_rust_jpeg_decode || skia_use_rust_jpeg_encode) {
+  config("rust_jpeg_cxx_bridge_public_config") {
+    include_dirs = [ "$root_out_dir" ]
+  }
+  config("rust_jpeg_cxx_bridge_private_config") {
+    include_dirs = [ "." ]
+  }
+  skia_source_set("rust_jpeg_cxx_bridge") {
+    deps = [ ":rust_all_ffi_bazel_build" ]
+    public = [ "${root_out_dir}/experimental/rust_jpeg/ffi/FFI.rs.h" ]
+    sources = [ "${root_out_dir}/experimental/rust_jpeg/ffi/FFI.rs.cc" ]
+    public_configs = [ ":rust_jpeg_cxx_bridge_public_config" ]
+    configs = [ ":rust_jpeg_cxx_bridge_private_config" ]
+  }
+}
+
+optional("jpeg_decode_rust") {
+  public_defines = [ "SK_CODEC_DECODES_JPEG_WITH_RUST" ]
+  enabled = skia_use_rust_jpeg_decode
+  public = skia_codec_rust_jpeg_public
+  sources = skia_codec_rust_jpeg
+  sources_for_tests = [ "tests/SkJpegRustCodecTest.cpp" ]
+  deps = [
+    ":jpeg_encode_rust",
+    ":rust_ffi_libs",
+    ":rust_jpeg_cxx_bridge",
+    "modules/skcms",
+  ]
+  libs = [ "c++" ]
+  if (skia_use_jpeg_gainmaps) {
+    public_defines += [ "SK_CODEC_DECODES_JPEG_GAINMAPS" ]
+    deps += [ ":xml" ]
+    sources += skia_codec_jpeg_xmp
+  }
+}
+
+optional("jpeg_encode_rust") {
+  public_defines = [ "SK_CODEC_ENCODES_JPEG_WITH_RUST" ]
+  enabled = skia_use_rust_jpeg_encode
+  public = skia_encode_rust_jpeg_public
+  sources = skia_encode_rust_jpeg_srcs
+  deps = [
+    ":rust_ffi_libs",
+    ":rust_jpeg_cxx_bridge",
+  ]
+  libs = [ "c++" ]
+}
+
 optional("webp_decode") {
   enabled = skia_use_libwebp_decode
   public_defines = [ "SK_CODEC_DECODES_WEBP" ]
@@ -2959,6 +3039,7 @@ if (skia_enable_tools) {
         ":fontmgr_mac_ct_tests",
         ":fontscanner_tests",
         ":ico_decode_rust_tests",
+        ":jpeg_decode_rust_tests",
         ":png_decode_libpng_tests",
         ":png_decode_rust_tests",
         ":png_encode_rust_tests",
@@ -2981,6 +3062,12 @@ if (skia_enable_tools) {
         "//third_party/libwebp",
         "//third_party/zlib",
       ]
+      if (skia_use_rust_jpeg_decode) {
+        deps += [ ":jpeg_decode_rust" ]
+      }
+      if (skia_use_rust_jpeg_encode) {
+        deps += [ ":jpeg_encode_rust" ]
+      }
     }
   }
 
@@ -3328,6 +3415,7 @@ if (skia_enable_tools) {
         "modules/jsonreader",
         "modules/skottie:fuzz",
         "modules/skparagraph",
+        "modules/skshaper",
         "modules/svg",
       ]
       if (skia_use_rust_bmp_decode) {
@@ -3911,7 +3999,10 @@ if (skia_build_fuzzers) {
       "fuzz/FuzzSkParagraph.cpp",
       "fuzz/oss_fuzz/FuzzSkParagraph.cpp",
     ]
-    deps = [ "modules/skparagraph" ]
+    deps = [
+      "modules/skparagraph",
+      "modules/skshaper",
+    ]
   }
 
   libfuzzer_app("api_svg_canvas") {
@@ -4037,7 +4128,10 @@ if (skia_build_fuzzers) {
 
   libfuzzer_app("svg_dom") {
     sources = [ "fuzz/oss_fuzz/FuzzSVG.cpp" ]
-    deps = [ "modules/svg" ]
+    deps = [
+      "modules/skshaper",
+      "modules/svg",
+    ]
   }
 
   libfuzzer_app("skruntimeblender") {

DEPS

@@ -9,7 +9,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling different
   # dependencies without interference from each other.
-  'infra_revision': 'd47334d0785d47ea913b41efd0038430e193525c',
+  'infra_revision': '57107b5a16cbfe5a9fa0c3e0a81146eabc1cd506',
 
   # ninja CIPD package version.
   # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
@@ -20,7 +20,7 @@ vars = {
   'googlefonts_testdata_version': 'version:20230913',
 
   # Pre-built task drivers from this repo, used for CI.
-  'task_drivers_revision': 'git_revision:348e064d2951b8209dd3dc77e89b8bc5d57242af',
+  'task_drivers_revision': 'git_revision:782dfac458428f99c91f1b09ccb4f88dadc06c1c',
 
   'checkout_agents_internal': False,
 }
@@ -116,4 +116,11 @@ deps = {
     'url': 'https://skia.googlesource.com/buildbot.git@' + Var('infra_revision'),
     'condition': 'False',
   },
+
+  'agents/shared': 'https://chromium.googlesource.com/chromium/agents/@e75efa515896f6bf1dea92eaffbcf8ee711a65d8',
+
+  'agents/internal': {
+    'url': 'https://chrome-internal.googlesource.com/chrome/agents-internal/@11c700b10e171091b4f0f3cf3bf95f13dee85c93',
+    'condition': 'checkout_agents_internal',
+  },
 }

MODULE.bazel

@@ -156,6 +156,19 @@ crate.spec(
     package = "image",
     rev = "5d0418d0eff747c829d52738c092581312f775c9",
 )
+crate.spec(
+    package = "jpeg-encoder",
+    version = "=0.6.0",
+)
+crate.spec(
+    package = "zune-jpeg",
+    version = "=0.5.16-rc1",
+)
+crate.spec(
+    features = ["std"],
+    package = "zune-core",
+    version = "=0.5.3",
+)
 crate.spec(
     package = "moxcms",
     version = "=0.8.0",
@@ -326,6 +339,10 @@ download_windows_amd64_toolchain(name = "clang_windows_amd64")
 cipd_deps = use_extension("//bazel:cipd_deps.bzl", "cipd_deps")
 use_repo(
     cipd_deps,
+    "cpython_linux_amd64",
+    "cpython_mac_amd64",
+    "cpython_mac_arm64",
+    "cpython_windows_amd64",
     "git_linux_amd64",
     "gn_linux_amd64",
     "gn_mac_amd64",

MODULE.bazel.lock

@@ -500,12 +500,12 @@ def _CheckBannedAPIs(input_api, output_api):
     (r'std::stold\(', 'std::strtold(), which does not throw'),
     # go/cstyle#Disallowed_Stdlib
     (r'std::barrier', ''),
-    (r'std::condition_variable', ''),
+    (r'std::condition_variable', '', 'PipelineManager'),
     (r'std::counting_semaphore', ''),
     (r'std::future', ''),
     (r'std::jthread', ''),
     (r'std::latch', ''),
-    (r'std::mutex', 'SkMutex'),
+    (r'std::mutex', 'SkMutex', ['^example/', 'PipelineManager']),
     (r'std::shared_mutex', 'SkSharedMutex'),
     (r'std::stop_token', ''),
     (r'std::thread', '', ['^tests/', 'SkExecutor']),

PRESUBMIT.py

@@ -2,6 +2,23 @@ Skia Graphics Release Notes
 
 This file includes a list of high level updates for each milestone release.
 
+Milestone 153
+-------------
+  * `SkLogHandler` has been added as a global callback interface to intercept Skia's internal logs. Clients can implement this interface and install it via `SkLogHandler::SetInstance` to receive all messages generated through the `SKIA_LOG` macros. `SkLogHandler` uses `sk_sp` for shared ownership, allowing clients to maintain a reference to the handler.
+  * `SkImageFilters::RuntimeShader` factories now take an optional
+    `restrictOutputToInputBounds` parameter (default `false`). When `true`, the
+    caller promises that the SkSL evaluates to transparent black wherever its child
+    shaders are transparent black, allowing the filter's output to be restricted to
+    the union of its inputs' bounds instead of being unbounded. This lets effects
+    composed after the runtime shader (e.g. a blur using a non-decal tile mode)
+    observe the intended content bounds.
+  * Added the `skia_enable_threadlocal_strikecache` GN build argument
+    (which defines `SK_ENABLE_THREADLOCAL_STRIKECACHE`) to enable
+    thread-local `SkStrikeCache` instances
+  * Graphite's `PipelineManager` can now make use of the `SkExecutor` passed in via `ContextOptions`. If provided, the `SkExecutor` will be used to compile Pipelines.
+
+* * *
+
 Milestone 152
 -------------
   * Add skgpu::graphite::ContextOptions::fAvoidDepth. Enabling this will lead

RELEASE_NOTES.md

@@ -71,6 +71,9 @@ If a build requires Rust dependencies (in `third_party`), use `bazelisk` to mana
 - **iOS**: `./bin/gn gen -q out/ios --args='target_os="ios" target_cpu="arm64"'`
 - **Windows**: Use `clang_win="<path_to_llvm>"` to build with clang-cl (highly recommended).
 
+### 4. Other Build Notes
+- Unless otherwise instructed, build with: `ninja --quiet -C {OUT_DIR} {TARGET}`. If given an `ninja` command that is missing `--quiet`, you *must* add `--quiet`.
+
 ## Tool Reference
 
 ### `dm` (Correctness Testing)