[skia-sync] Merge upstream chrome/m148 bug fixes#4253
Closed
mattleibow wants to merge 1 commit into
Closed
Conversation
Updates the externals/skia submodule with 2 new upstream cherry-picks on chrome/m148 since the m148 merge that shipped in release 4.148.0: * 46f2e16555 [m148] Resolved a Data Race on fStream in SkTypeface_Mac * 3a90f6662a [graphite] Use stable collection for static bindings (graphite-only) This is a release-line, bug-fix-only sync. No milestone, soname, or NuGet version bumps. Only cgmanifest.json's commit/upstream hashes change in the parent repo. 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 -- 4253PowerShell / Windows: iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 4253"Step 2 — Add the local NuGet source dotnet nuget add source ~/.skiasharp/hives/pr-4253/packages --name skiasharp-pr-4253More options
Or download manually from Azure Pipelines — look for the Remove the source when you're done: dotnet nuget remove source skiasharp-pr-4253 |
Collaborator
Author
|
Closing stale skia-sync validation branch/PR to give the refactored auto-skia-sync workflow a clean slate for a fresh run. |
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 m148. Targeting release branch
release/4.148.x(mono/skiarelease/4.148.x).Companion skia PR: mono/skia#266
Summary
Release-line, bug-fix-only sync of
release/4.148.xagainstupstream/chrome/m148(46f2e16555cac1211f4087cf24728fd741ac6495).Picks up 2 upstream cherry-picks since the last sync. Companion PR in
mono/skiacarries the actual source changes; this PR only advances thesubmodule pointer and refreshes
cgmanifest.json.current == target == 148, so no milestone/soname/NuGet version bumps —see the Phase 6 release-line rule.
Breaking change analysis
Both upstream commits are isolated to non-shim files and do not change any
header consumed by
binding/SkiaSharp/. Categorisation:46f2e16555— Race fix inSkTypeface_Macstd::recursive_mutexaroundfStreaminSkTypeface_Mac; no public C++ API surface changes, no C API change3a90f6662a— Graphite static-binding allocator switchDawnGraphicsPipeline.cppis not compiled intolibSkiaSharpNo removed or renamed APIs. Header diff against the previous tip confirmed
zero changes under
include/core/,include/gpu/ganesh/,include/c/, orinclude/xamarin/.Version / binding updates
cgmanifest.jsonmono/skiacommitHash→ac40acbd6aedbdd8249997d6ad9a7d5cc614890c;upstream_merge_commit→46f2e16555cac1211f4087cf24728fd741ac6495externals/skiasubmodule1a155bae3atoac40acbd6a(the merge commit onskia-sync/release-4.148.xin mono/skia)scripts/VERSIONS.txtscripts/azure-templates-variables.ymlexternals/skia/include/c/sk_types.hSK_C_INCREMENTC# changes
None.
pwsh .agents/skills/update-skia/scripts/regenerate-bindings.ps1reported:
No changes to bindings (C API signatures unchanged)No new functions foundgit diff origin/release/4.148.x -- binding/SkiaSharp/SkiaApi.generated.cson
+.*internal staticlines: empty. No new C# wrappers required.HarfBuzz bindings were proactively reverted by the script as per the
standard skill workflow.
Build & test results (Linux x64)
dotnet tool restoreexternals-linux --arch=x64)libSkiaSharp.so.148.0.0produced; total 15m28s. Log:native-build.logregen-bindings.logbinding/SkiaSharp/SkiaSharp.csproj)csharp-build.logCategory=Smoke)smoke-test.logtest-output.txtThe 172 skipped tests are the usual platform/hardware-dependent ones
(non-Linux platforms, missing Vulkan/Direct3D,
Bgr101010xXR/Bgra10101010XRcolor types, etc.) — same baseline as
release/4.148.xhead.Items needing human attention
SkTypeface_Macrace fixcannot be exercised on the Linux x64 agent. Confirm the macOS, iOS, Mac
Catalyst, Windows, and Android legs of this PR's CI all stay green before
merging.
(
skia-sync/release-4.148.x) MUST be squash-merged first; this parent PRmust then be re-pointed to the resulting
release/4.148.xSHA before itsown merge — see the Phase 11 merge sequence in
SKILL.md. The merge-bottracks this automatically only when both PRs are linked.
(libpng 1.6.58, zlib 1.3.2, libjpeg-turbo 3.1.4.1, libwebp 1.6.0,
ANGLE chromium/6275, harfbuzz 14.2.0, etc.) are unchanged —
cgmanifest.jsonedits are limited to the skia
commitHash/upstream_merge_commitfields.Created by skia-upstream-sync.