[skia-sync] Merge upstream chrome/m150 - #336
Merged
Merged
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>
…lease-4.150.x # Conflicts: # DEPS
mattleibow
added
type/milestone-sync
mattleibow
marked this pull request as ready for review
August 4, 2026 14:07
mattleibow
added a commit
to mono/SkiaSharp
that referenced
this pull request
Aug 4, 2026
[skia-sync] Merge upstream chrome/m150 bug fixes (#4648) Changes: mono/skia#336 Update the release/4.150.x SkiaSharp line to the m150 bug-fix sync from mono/skia. Advance the Skia submodule and update cgmanifest.json to record the new fork and upstream merge commits. This is a release-line sync only: package versions, SONAMEs, SK_C_INCREMENT, and the managed API remain unchanged. Regenerating the bindings produces no diff, confirming that the upstream fixes do not affect the C API or P/Invoke surface. Native and managed builds pass, along with the full test suite. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> `` inst
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.
Automated upstream merge of
chrome/m150.Upstream merge
Bug-fix sync on the
release/4.150.xline — mergedupstream/chrome/m150(tip
a81173f17b197686dc1e6c78515de86e92ddc861) intoskia-sync/release-4.150.x.Two new upstream commits since the previous sync:
a81173f17b[M150] Address incorrect handling of a map pointer in SkRP4452d2cbf4Roll infra dep to 055b758759c89b0cfafc8264ae2100a9aa6582d3Upstream files touched:
DEPS,go.mod/go.sum,infra/bots/**(Go taskdrivers +
tasks.json),src/sksl/codegen/SkSLRasterPipelineCodeGenerator.cpp,tests/RasterPipelineCodeGeneratorTest.cpp. No files added or removedunder
src/orinclude/, soBUILD.gnneeded no source-list update.Conflicts resolved
DEPSinfra_revisionbump (5997e027…→055b7587…), kept all fork dependency pins (harfbuzz, expat, libjpeg-turbo, freetype, zlib, libpng, libwebp, brotli, deps-removal). No fork patch has ever touchedinfra_revision; verified bygit log --oneline release/4.150.x -- DEPSagainst the pre-merge fork-patch snapshot in/tmp/gh-aw/agent/fork-patches-before.txt.No other conflicts. C API files (
src/c/,include/c/) untouched by the merge.C API fixes
None — no upstream C++ API changes affected our C API shim.
SK_C_INCREMENTremains
0(release-line policy).Items needing human attention
None. Straightforward bug-fix sync; native build + full C# test suite are green.
Created by skia-upstream-sync.