Bump skia to milestone 133 (G) - #3660
Merged
Merged
Conversation
- update the bundled Skia revision and version metadata to m133\n- link jsonreader for native Apple/Tizen builds and regenerate bindings\n- expose CreateCicp on SKColorSpace and keep stream ownership tests green\n\nCo-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 -- 3660PowerShell / Windows: iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 3660"Step 2 — Add the local NuGet source dotnet nuget add source ~/.skiasharp/hives/pr-3660/packages --name skiasharp-pr-3660More options
Or download manually from Azure Pipelines — look for the Remove the source when you're done: dotnet nuget remove source skiasharp-pr-3660 |
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. |
The m133 update does not require the HandleDictionary type-mismatch adjustment, so drop it from this PR to keep the scope limited.\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Pick up the Skia submodule fix for the strict_aliasing merge regression, keep the unused delaunator-cpp DEPS entry disabled, and align cgmanifest's mono/skia commitHash with the vendored submodule commit. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Keep the narrower HandleDictionary behavior for plain GetInstance lookups so handle-type mismatches and unknown wrapper types return false instead of throwing during ownership/GC scenarios, while GetOrAddObject remains strict for construction paths. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This reverts commit e42f18e.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mattleibow
added a commit
to mono/skia
that referenced
this pull request
Apr 14, 2026
Changes: google/skia@9ab7c20...f7d1434 Merge upstream chrome/m133 into the SkiaSharp fork and update the C API shim layer to match. ~~ Upstream merge ~~ 806 files changed across the m132→m133 milestone. The fork carries forward all 49 existing patches with adjustments to 6 of them: * DEPS: bump skia-infra to 783200f; disable new delaunator-cpp dependency (unused by SkiaSharp) * gn/skia/BUILD.gn: adopt the upstream strict_aliasing / no_strict_aliasing config split, replacing the hard-coded -fstrict-aliasing flag so PartitionAlloc and similar consumers can opt out * Go module files (.disabled.go.mod/sum/bzl): version bumps for infra, crypto, net, sys, term (disabled, not used by SkiaSharp) * src/gpu/ganesh/gl/iOS/GrGLMakeNativeInterface_iOS.cpp: include reorder and SkTemplates.h re-added to match upstream ~~ C API shim changes ~~ * Add sk_colorspace_new_cicp() with two new CICP enums (sk_colorspace_primaries_cicp_t, sk_colorspace_transfer_fn_cicp_t) for ITU-T H.273 color space creation * Add fGainmap/fGainmapInfo fields to sk_pngencoder_options_t * Update sk_linker.cpp include from src/utils/SkJSON.h to modules/jsonreader/SkJSONReader.h following the upstream JSON reader module split Companion SkiaSharp PR: mono/SkiaSharp#3660
Point externals/skia at the merge commit on skiasharp (0c28aa73be) and update cgmanifest.json commitHash to match. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Add tests covering the new CreateCicp API beyond the existing sRGB case: - PQ + Rec2020 (HDR10) - HLG + Display P3 (broadcast HDR) - Rec2020 + Linear (wide gamut) - Unknown primaries/transfer returns null - PNG with CICP chunk decodes with correct color space Include cicp_pq.png test image from upstream Skia resources. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mattleibow
force-pushed
the
mattleibow/update-skia-m133
branch
from
April 14, 2026 05:33
46f7240 to
737a991
Compare
Add the CICP PQ PNG test image to the gallery Image Decoder sample so the m133 color-space work is visible interactively. Surface useful decode metadata such as origin, frame count, and whether the image decodes as sRGB or HDR/custom. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Keep PR #3660 focused on the Skia m133 update by dropping the experimental gallery Image Decoder changes. The UI polish can land separately without the CICP-specific sample additions. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mattleibow
added a commit
that referenced
this pull request
Apr 28, 2026
The Skia m133 bump (PR #3660) was already merged — it's the defining feature of this version. The workflow now always mentions the Skia engine version (derived from the version number) and searches for the corresponding merged bump PR to link to. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mattleibow
added a commit
that referenced
this pull request
Apr 28, 2026
The date-based approach (merged:>release_date) missed PRs that were
merged before the release date but after the release commit. This
happened because the release tag can be cut from an earlier commit
on main, leaving newer-merged PRs unreleased.
Now uses git log {tag}..origin/main to find commits not in the tag,
extracts PR numbers from merge commit messages, and fetches their
details. This correctly found 57 PRs (vs 20 with the date approach),
including the Skia m133 bump (PR #3660).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mattleibow
added
the
type/milestone-bump
1 task
mattleibow
added
the
type/milestone-sync
mattleibow
added
the
partner/agentic-workflows
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
1 participant
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.
Summary
jsonreadermodule for native Apple/Tizen builds and regenerate the bindingsSKColorSpace.CreateCicp(...)and keep the stream ownership tests green after the updateRelated