Skip to content

[skia-sync] Merge upstream chrome/m151#275

Closed
mattleibow wants to merge 3 commits into
skiasharpfrom
skia-sync/m151
Closed

[skia-sync] Merge upstream chrome/m151#275
mattleibow wants to merge 3 commits into
skiasharpfrom
skia-sync/m151

Conversation

@mattleibow

Copy link
Copy Markdown
Collaborator

Automated upstream merge of chrome/m151.

mono/skia — Merge upstream chrome/m151 (bug-fix sync)

Summary

Merges the current tip of upstream/chrome/m151 into our
skiasharp branch. Same-milestone bug-fix sync (m151 → m151):
no C++ / C API / DEPS / binding changes.

  • Base branch: skiasharp
  • Head branch: skia-sync/m151
  • Upstream ref merged: chrome/m151 @ 1536d3975057297af8087d22419f6c95dc96305d
  • Previous merge: 5209f4a49b55104de2c521fc6f605aee530e4cd8 ([skia-sync] Merge upstream chrome/m151 (#274))
  • New merge commit: 67d4e950785b19ffa49ff1a8fd5f440ec628340d (two-parent, preserves git blame attribution)

Upstream commits picked up (2)

SHA Subject Category
1536d3975 Merge 3 release notes into RELEASE_NOTES.md Docs
ac3c0d3fc Filter unsupported CQ try jobs on chrome/m151 Upstream CI infra

Combined diffstat

 RELEASE_NOTES.md              | 11 +++++++++++
 infra/bots/jobs.json          | 17 +++--------------
 infra/bots/tasks.json         | 11 -----------
 relnotes/ext_format_query.md  |  1 -
 relnotes/rust_png_gainmap.md  |  1 -
 relnotes/strided_getwidths.md |  4 ----
 6 files changed, 14 insertions(+), 31 deletions(-)

Merge conflicts

None. git merge --no-commit upstream/chrome/m151 completed cleanly
(Automatic merge went well; stopped before committing as requested).
git diff --check reports zero conflict markers.

No conflict resolution was needed, so the mandatory
"verify-upstream-or-reapply" audit table is empty by construction —
every fork patch remains on the branch untouched. Snapshot of the 1025
fork patches taken before the merge (fork-patches-before.txt); none
of them touch any of the 6 files modified upstream in this sync.

C API shim fixes

None required. No files under include/c/ or src/c/ were touched
by upstream in this range, so no shim adaptation was needed. Verified
all 79 C API headers/implementations remain intact after the merge:

$ ls src/c/*.cpp include/c/*.h | wc -l
79

git blame src/c/sk_canvas.cpp still resolves to the original 2016 /
2018 authoring commits, confirming the merge preserved history.

Items needing human attention

None — this is a docs- and infra-only bump from upstream. No new gn
args, no new source files added to BUILD.gn, no DEPS changes,
SK_C_INCREMENT remains at 0.

Created by skia-upstream-sync.

chrome-branch-day and others added 3 commits June 30, 2026 13:38
Change-Id: I93ae3f301011516b8226027c603054c5c8fa2cf6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1282216
Bot-Commit: chrome-branch-day <chrome-branch-day@chops-service-accounts.iam.gserviceaccount.com>
Change-Id: I80209091f73e94850533419e656431218b353a6f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1282199
Bot-Commit: chrome-branch-day <chrome-branch-day@chops-service-accounts.iam.gserviceaccount.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant