From 94200ae77c20f682458363da54750cdb5fdce8f3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 26 Jun 2026 21:14:27 +0000
Subject: [PATCH 1/2] [skia-sync] Merge upstream chrome/m148 bug fixes

Pulls 2 upstream bug fixes onto release/4.148.x:

- 46f2e16555 [m148] Resolved a Data Race on fStream in SkTypeface_Mac
- 3a90f6662a [graphite] Use stable collection for static bindings

Submodule bump only. No version/milestone changes (release-line sync,
current == target == m148), no C API changes, no binding regeneration
delta, no behavioural changes for non-macOS/non-Graphite users.

cgmanifest.json updated:
- mono/skia commitHash:        1a155bae3a -> 6d45d9aed1
- upstream_merge_commit:       54851b68b7 -> 46f2e16555 (chrome/m148 HEAD)
- chrome_milestone:            148 (unchanged)

Build / test results (Linux x64):
- Native build: libSkiaSharp.so.148.0.0 produced successfully
- C# build:     0 errors, 0 warnings
- Smoke tests:  32/32 passed
- Full tests:   5544 passed, 0 failed, 172 skipped (HW-dependent)

Companion mono/skia PR on branch skia-sync/release-4.148.x.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 cgmanifest.json | 4 ++--
 externals/skia  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index e60129991ae..47c47c3906e 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -216,7 +216,7 @@
         "type": "git",
         "git": {
           "repositoryUrl": "https://github.com/mono/skia.git",
-          "commitHash": "1a155bae3ac86db6d3efbd996f00e774b6a7b722"
+          "commitHash": "6d45d9aed12bacb599261ccebcf4a9764b0467ea"
         }
       }
     },
@@ -231,7 +231,7 @@
         }
       },
       "chrome_milestone": 148,
-      "upstream_merge_commit": "54851b68b7a1d49bc4b4361f12786a7d7ad91fff"
+      "upstream_merge_commit": "46f2e16555cac1211f4087cf24728fd741ac6495"
     }
   ]
 }
diff --git a/externals/skia b/externals/skia
index 1a155bae3ac..6d45d9aed12 160000
--- a/externals/skia
+++ b/externals/skia
@@ -1 +1 @@
-Subproject commit 1a155bae3ac86db6d3efbd996f00e774b6a7b722
+Subproject commit 6d45d9aed12bacb599261ccebcf4a9764b0467ea

From 6877dbc970d12fb162e3e2820e9705955001c13a Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Mon, 29 Jun 2026 17:05:06 +0200
Subject: [PATCH 2/2] Update skia submodule to tip of release/4.148.x

Point externals/skia at 9bf10f9f, the merge of the skia-sync/release-4.148.x
upstream chrome/m148 bug fixes into the release/4.148.x branch (mono/skia#268),
instead of the interim skia-sync branch commit (6d45d9aed). cgmanifest.json is
updated to match.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 cgmanifest.json | 2 +-
 externals/skia  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index 47c47c3906e..463531ba6aa 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -216,7 +216,7 @@
         "type": "git",
         "git": {
           "repositoryUrl": "https://github.com/mono/skia.git",
-          "commitHash": "6d45d9aed12bacb599261ccebcf4a9764b0467ea"
+          "commitHash": "9bf10f9f96b2b36ada8d6dd3bc1958193a9cb787"
         }
       }
     },
diff --git a/externals/skia b/externals/skia
index 6d45d9aed12..9bf10f9f96b 160000
--- a/externals/skia
+++ b/externals/skia
@@ -1 +1 @@
-Subproject commit 6d45d9aed12bacb599261ccebcf4a9764b0467ea
+Subproject commit 9bf10f9f96b2b36ada8d6dd3bc1958193a9cb787