[skia-sync] Merge upstream chrome/m148 bug fixes#4252
Closed
mattleibow wants to merge 1 commit into
Closed
Conversation
Bumps the externals/skia submodule and cgmanifest.json to pick up two new upstream bug-fix commits on chrome/m148: - 46f2e16555 [m148] Resolved a Data Race on fStream in SkTypeface_Mac - 3a90f6662a [graphite] Use stable collection for static bindings This is a release-line sync targeting release/4.148.x. Because CURRENT == TARGET (148), no version, soname, or milestone files change; the only parent-repo change is cgmanifest.json's commitHash and upstream_merge_commit fields. Both upstream commits touch only upstream-only sources (src/ports/SkTypeface_mac_ct.* and a Graphite/Dawn pipeline file). SkiaSharp's C API is unchanged, so the regenerated bindings show no diff and no C# wrappers needed updates. Native build (Linux x64) succeeds. Full test suite passes locally: Passed: 5544, Failed: 0, Skipped: 172. 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 -- 4252PowerShell / Windows: iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 4252"Step 2 — Add the local NuGet source dotnet nuget add source ~/.skiasharp/hives/pr-4252/packages --name skiasharp-pr-4252More options
Or download manually from Azure Pipelines — look for the Remove the source when you're done: dotnet nuget remove source skiasharp-pr-4252 |
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#265
Skia upstream sync —
release/4.148.x(m148 bug fixes)Companion PR to the
mono/skiamerge ofupstream/chrome/m148intoskia-sync/release-4.148.x. This PR updates the SkiaSharp submodulepointer and
cgmanifest.jsonto record the new upstream SHA.This is a release-line / bug-fix-only sync (
CURRENT == TARGET == 148),so per the
update-skiaskill no milestone, soname, nuget version, orSK_C_INCREMENTchanges are involved.Upstream merge summary
Two new upstream
chrome/m148commits merged into the release line:3a90f6662a[graphite] Use stable collection for static bindings46f2e16555[m148] Resolved a Data Race on fStream in SkTypeface_MacfStreamSubmodule advanced:
1a155bae3ac86db6d3efbd996f00e774b6a7b722→d5c1f3f66dfc7c41f32240191b9a33bb55758f89.Breaking change analysis
No breaking changes. Both upstream commits are bug fixes within m148;
neither modifies any C++ public header that the SkiaSharp C API
(
externals/skia/include/c//src/c/) depends on:SkTypeface_mac_ct.{cpp,h}— internal Apple typeface backend, no publicAPI surface change; the diff guards
fStreamaccess with the existingmutex.
DawnGraphicsPipeline.cpp— Graphite backend implementation detail(binding-group static initializer), not exposed through any C API.
No removed / renamed / re-signed APIs. No header moves. No enum changes.
ABI is preserved for downstream consumers of
SkiaSharp4.148.x.Version / binding updates
cgmanifest.json:commitHash:1a155bae3a…→d5c1f3f66d…(the new mono/skia merge SHA)upstream_merge_commit:54851b68b7…→46f2e16555…(upstreamchrome/m148tip)scripts/VERSIONS.txt— unchanged (stilllibSkiaSharp milestone 148,increment 0)scripts/azure-templates-variables.yml— unchanged (SKIASHARP_VERSION: 4.148.1)externals/skia/include/c/sk_types.h— unchanged (SK_C_INCREMENT 0)externals/skia/include/core/SkMilestone.h— unchanged (SK_MILESTONE 148)C# changes
None.
pwsh .agents/skills/update-skia/scripts/regenerate-bindings.ps1reportsNo changes to bindings (C API signatures unchanged)andNo new functions found. No C# wrappers require updates because the C APIshim itself is unchanged.
Build & test results
dotnet tool restoredotnet cake --target=externals-linux --arch=x64libSkiaSharp.so.148.0.0(~10.8 MB) +libHarfBuzzSharp.so.0.61420.0(~2.9 MB) built in 15m34spwsh .agents/skills/update-skia/scripts/regenerate-bindings.ps1dotnet build binding/SkiaSharp/SkiaSharp.csprojCategory=Smoke)SkiaSharp.Tests.Console)Skipped tests are the standard set for a Linux x64 CI environment with no
GPU/Metal/Direct3D/Vulkan-on-display and no fonts that are macOS- or
Windows-specific. No tests were marked skip to dodge a failure.
Full test output is uploaded as the
test-output.txtartifact forinspection if needed.
Items needing human attention
None. The sync is clean — no conflicts, no breaking changes, no shim
fixes, no binding diff, all tests pass.
The companion
mono/skiaPR must be merged first (so its squashedSHA lands on
release/4.148.x), then the submodule pointer in this PRmust be refreshed to that squashed SHA before this PR is merged.
Created by skia-upstream-sync.