[skia-sync] Merge upstream chrome/m150 bug fixes#4190
Merged
Conversation
Same-milestone sync: upstream cherry-pick for m150. New upstream commit: - 9f330f1704 [graphite] Use stable collection for static bindings (Graphite/Dawn backend only - no C API or Ganesh impact) Changes: - externals/skia: bump to 7742707ec7 (merged upstream chrome/m150) - cgmanifest.json: update commitHash and upstream_merge_commit Breaking changes: None (Graphite-only change, SkiaSharp uses Ganesh) Build: Linux x64 ✅ Tests: 5544 passed, 172 skipped, 0 failed ✅ Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
📦 Try the packages from this PRWarning Do not run these scripts without first reviewing the code in this PR. Step 1 — Download the packages bash / macOS / Linux: curl -fsSL https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.sh | bash -s -- 4190PowerShell / Windows: iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 4190"Step 2 — Add the local NuGet source dotnet nuget add source ~/.skiasharp/hives/pr-4190/packages --name skiasharp-pr-4190More options
Or download manually from Azure Pipelines — look for the Remove the source when you're done: dotnet nuget remove source skiasharp-pr-4190 |
Contributor
|
📖 Documentation Preview The documentation for this PR has been deployed and is available at: 🔗 View Staging Site This preview will be updated automatically when you push new commits to this PR. This comment is automatically updated by the documentation staging workflow. |
Merge single upstream commit: - 14d05ec761 [m150] Resolved a Data Race on fStream in SkTypeface_Mac (macOS thread safety fix, no C API or Ganesh impact) Breaking change analysis: no HIGH or MEDIUM risk changes. Both commits are macOS/Graphite internals, no C API impact. Build: Linux x64 native build passed (1485 targets) Tests: Passed - Failed: 0, Passed: 5544, Skipped: 172, Total: 5716 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Repoint the submodule from the pre-merge feature-branch head 38b9d41d3d to f6ee107ea5, the merge commit of skia PR mono/skia#259 on the skiasharp branch (tree-identical to 38b9d41d3d). Update cgmanifest.json commitHash to match. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated upstream bug-fix sync for m150.
Companion skia PR: mono/skia#259
mono/SkiaSharp PR Summary: Update Skia milestone 150 (bug-fix sync)
Overview
Same-milestone sync: merged 2 upstream chrome/m150 cherry-picks.
skia-sync/m150mainf6ee107ea5Upstream Commits Merged
14d05ec7619f330f1704Breaking Change Analysis
No breaking changes. Both commits are internal correctness fixes with no public or C API surface change:
14d05ec761— [m150] Resolved a Data Race on fStream in SkTypeface_Macsrc/ports/SkTypeface_mac_ct.{cpp,h}SkOncestream-init guard with anSkSharedMutex(fStreamMutex): exclusive lock inonOpenStream, shared lock inonOpenExistingStream/onMakeClonefStreamcould collide with another reading it. Relevant because the macOS/CoreText port backsSKTypefaceon Apple platforms, where typefaces are commonly shared across threads.9f330f1704— [graphite] Use stable collection for static bindingssrc/gpu/graphite/dawn/DawnGraphicsPipeline.cpp(std::vector→SkTBlockList/TArrayfor stable sampler-layout addresses)Files Changed
cgmanifest.jsoncommitHashtof6ee107ea5andupstream_merge_committo14d05ec761externals/skiaf6ee107ea5Version Changes
No version number changes (same milestone, same nuget version
4.150.0).Binding Regeneration
Bindings were regenerated — no changes (C API signatures unchanged by both commits).
Items Needing Human Attention
None. This is a clean, low-risk same-milestone bug-fix sync.
The CI will run the full platform matrix (macOS, Windows, Linux ARM64, iOS, Android, WASM) as part of the PR pipeline.
Created by skia-upstream-sync.