[skia-sync] Merge upstream chrome/m151#277
Draft
mattleibow wants to merge 3 commits into
Draft
Conversation
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>
Merge two upstream commits since the previous m151 sync: - 1536d39 Merge 3 release notes into RELEASE_NOTES.md - ac3c0d3 Filter unsupported CQ try jobs on chrome/m151 No SkiaSharp-visible changes: only RELEASE_NOTES.md and infra/bots/ (jobs.json, tasks.json) are touched. No C++ source, headers, C API, or DEPS changes. All fork patches are preserved. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.
Automated upstream merge of
chrome/m151.Sync mono/skia with upstream chrome/m151 (bug-fix only)
Mode: Same-milestone bug-fix sync (
CURRENT == TARGET == m151,is_release == false).No milestone/version bump — this only re-syncs the mono/skia
skiasharpbranch withupstream
chrome/m151to pick up 2 new bug-fix commits since our last merge.Merge details
origin/skiasharp—e1be35b25f[gn] Drop redundant SK_BUILD_FOR_WASM define (drop redundant SK_BUILD_FOR_WASM define #204)upstream/chrome/m151— tip at1536d3975057297af8087d22419f6c95dc96305dskia-sync/m151— merge commitde2e431eb3533193f077ad8a038a0a8239147db8(two-parent, proper history)79e2e1538e94bb1d6b5bbbc56279036aa7574b101536d3975057297af8087d22419f6c95dc96305dUpstream commits merged (2)
1536d39750RELEASE_NOTES.md,relnotes/{ext_format_query,rust_png_gainmap,strided_getwidths}.md(deleted)ac3c0d3fcdinfra/bots/{jobs,tasks}.jsonBoth commits are non-code (release notes + infra CI config). No C++ source, headers,
C API, DEPS, or third-party dependency changes.
Conflicts resolved
None.
git merge --no-commit upstream/chrome/m151completed cleanly with"Automatic merge went well". All affected files (RELEASE_NOTES.md, infra/bots/) fell
into the "Take upstream" category per the SKILL.md file-category table, and no
SkiaSharp fork patches touch any of these files, so no fork patch classification was
needed.
Merged file changes (all from upstream side, no fork-side edits):
RELEASE_NOTES.mdinfra/bots/jobs.jsoninfra/bots/tasks.jsonrelnotes/ext_format_query.mdrelnotes/rust_png_gainmap.mdrelnotes/strided_getwidths.mdFork patches preserved
Snapshot of
origin/skiasharp..upstream/chrome/m151merge-base showed the full listof fork patches (see
/tmp/gh-aw/agent/fork-patches-before.txtartifact). None ofthem touch files that conflicted — all merged cleanly.
git blame src/c/sk_canvas.cppstill shows the original 2016/2018 Matthew Leibowitz commits (attribution preserved).
C API fixes
None. No changes to
include/c/**,src/c/**,sk_types.h, orSK_C_INCREMENT(remains at
0). All C API files are intact.Gate verification
de2e431eb3 e1be35b25f 1536d39750ls src/c/*.cpp include/c/*.h— all presentgit diff --check— no conflict markersgit blameonsrc/c/sk_canvas.cppshows original attributiongit diff MB..upstream --diff-filter=AD -- src/ include/is empty)Items needing human attention
None. This is a pure bug-fix sync with no code changes, no conflicts, no C API
work, and no new upstream gn args required. The native build (Linux x64) and full
SkiaSharp test suite pass — see the mono/SkiaSharp PR summary for the parent-repo
build/test results.
Notes
notes and CI infra, so cross-platform impact is zero, but Windows/macOS/iOS/Android/
WASM CI will exercise the merged submodule on the mono/SkiaSharp PR as usual.
depot_toolsin the sandbox has an unrelated local edit(
gclient_paths.py:@functools.lru_cache→@functools.lru_cache()) — this is anenvironmental artifact of the runner's Python version and is not part of this
sync. It was deliberately not committed.
Created by skia-upstream-sync.