[skia-sync] Merge upstream chrome/m150 - #339
Closed
mattleibow wants to merge 3 commits into
Closed
Conversation
Bug: b/535581863 Change-Id: Idea1fd6496e8b54823f32820ae2351a6d17383f2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1308696 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Kaylee Lubick <kjlubick@google.com> Auto-Submit: Eric Boren <borenet@google.com> Commit-Queue: Kaylee Lubick <kjlubick@google.com>
Original change's description: > Address incorrect handling of a map pointer in SkRP > > In pushChildCall, we held on to a pointer from a fChildEffectMap > and then later dereferenced it. However, in between those > points was a code path that could grow the map, invalidating > the pointer. This is demonstrated in the newly added test. > > To fix it, we just dereference it earlier. While tracking this > down, I found a suspicious other usage of the map which works > in newer C++, but could break in older versions. It's trivial > to fix Generator::writeFunction, so I handled that as well. > > Bug: b/540157141 > Fixed: 540157141 > Change-Id: I149b070c31d4cfefa65b30972f0b8b94441e66db > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1308776 > Reviewed-by: Jorge Betancourt <jmbetancourt@google.com> > Commit-Queue: Kaylee Lubick <kjlubick@google.com> (cherry picked from commit 5b90a36) Bug: 541110610,b/540157141,540157141 Change-Id: I149b070c31d4cfefa65b30972f0b8b94441e66db Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1311197 Auto-Submit: Chrome Cherry Picker <chrome-cherry-picker@chops-service-accounts.iam.gserviceaccount.com> Commit-Queue: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Reconcile the release/4.150.x fork base with upstream chrome/m150 (a81173f) via a genuine two-parent merge. The fork base tree already contained the target content; this merge brings the target upstream commit into git ancestry so the recorded upstream_merge_commit and history agree. Merge range: a7fb0b3..a81173f (SkSL RasterPipeline map-pointer fix + CI infra roll). No C API, public-header, struct-layout, backend, or externals-dependency changes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
14 tasks
mattleibow
added
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
3 participants
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.
Note
Required merge method
Merge commit only. Do not squash or rebase this PR. The two-parent merge ancestry is required
so future syncs can prove which upstream commits are already integrated.
Description
Automated upstream merge of
chrome/m150.This pull request was produced by skia-upstream-sync.
SkiaSharp issue
N/A — automated upstream synchronization.
Required SkiaSharp PR
Requires mono/SkiaSharp#4661
Areas affected
include/c,src/c)DEPSChanges
Genuine two-parent merge of upstream
chrome/m150(a81173f17b197686dc1e6c78515de86e92ddc861)into the
release/4.150.xfork base (73959289693c85303585463d7998de32c6249457).bea5d329ad3d7dfb75464a794318dfc0a235c0ab(parents: fork base739592896+ upstreama81173f).a81173f. This is a release-line ancestryreconciliation: the recorded
upstream_merge_commitwasa81173fbut the squash-style forkbase did not have it in git ancestry (history stopped at merge-base
a7fb0b3c2e). The mergerestores true two-parent ancestry.
no
src/c/include/cC API, and nothird_party/externals/*revision changes.a7fb0b3c2e..a81173f= 2 commits:a81173f(SkSL RasterPipeline map-pointer fix +test) and
4452d2cbf4(CI-only infra dep roll addingcheckout_agents_internalvar; notcompiled into the native library, no tracked component).
--validategate passed.Testing
Native build from source succeeded:
dotnet cake --target=externals-linux --arch=x64(libSkiaSharp.so.150.0.0 + libHarfBuzzSharp linked; ~10 min cold build). Binding regeneration
reported no binding changes and no new native functions. Managed build clean.
Full unfiltered solution
tests/SkiaSharp.Tests.Console.sln(net10.0), all hosts passed:Final gate exit code 0. All
GpuPolicy-required Linux backends (Mesa softpipe GL, lavapipe VulkanICD) initialized and executed. No required backend was skipped; skips are pre-existing
platform/host capability skips (e.g. Direct3D on non-Windows).
Human review
release line (base==target upstream; no content delta).
this Linux x64 automation run and need the standard cross-platform CI matrix before merge.
Checklist
release/4.150.xbranchChangesabove lists every added/changed C API export or states that none changedmono/SkiaSharpPR linked aboveLast rendered by the sync workflow: 2026-08-04T21:34:52Z