[skia-sync] Merge upstream chrome/m150 - #340
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>
Genuine two-parent merge of upstream/chrome/m150 (a81173f) into the release-4.150.x fork line. Brings the SkRP RasterPipeline codegen map-pointer fix and infra dependency roll into git ancestry; the fork base already carried the equivalent source, so the merge introduces no tree change. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
14 tasks
mattleibow
added
partner/agentic-workflows
26 tasks
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#4662
Areas affected
include/c,src/c)DEPSChanges
Genuine two-parent merge of
upstream/chrome/m150(a81173f17b197686dc1e6c78515de86e92ddc861)into the
release/4.150.xfork line.945e27121f05c7d6d8187528c9a63367e33b1143— parents73959289…(fork base) anda81173f17b…(target upstream).a7fb0b3c2e…→ target):a81173f17b— [M150] Address incorrect handling of a map pointer in SkRP. Internal SkSLRasterPipeline codegen correctness fix (dereference
fChildEffectMappointer before a possiblyresizing insert) plus a regression test. No public/C API surface, no struct layout change.
4452d2cbf4— Roll infra dep. Touches onlyDEPSinfra_revision,go.mod/go.sum,infra/bots/**CI tooling. No build/runtime dependency; the fork base already pinned the targetinfra_revision.introduces no tree change while formalizing upstream git ancestry.
audit_fork_patches.py --validatepasses — 0 added/removed/changed patches(base and target upstream SHAs are identical; the fork delta is unchanged).
the fork revision.
agents/*/checkout_agents_internalupstream additions are inert(
condition: False).Testing
Native Linux x64 built from source (
libSkiaSharp.so.150.0.0,libHarfBuzzSharp.so). The managedsolution validation ran against this merged submodule commit:
No
GpuPolicy-required backend was skipped; skips are the existing platform-policy skips only.Human review
iOS, and WASM were not executed and need cross-platform review.
two-parent shape and that the recorded
upstream_merge_commitmatches the parent cgmanifest.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-04T22:13:36Z