[skia-sync] Merge upstream chrome/m151#275
Closed
mattleibow wants to merge 3 commits into
Closed
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>
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
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.mono/skia — Merge upstream
chrome/m151(bug-fix sync)Summary
Merges the current tip of
upstream/chrome/m151into ourskiasharpbranch. Same-milestone bug-fix sync (m151 → m151):no C++ / C API / DEPS / binding changes.
skiasharpskia-sync/m151chrome/m151@1536d3975057297af8087d22419f6c95dc96305d5209f4a49b55104de2c521fc6f605aee530e4cd8([skia-sync] Merge upstream chrome/m151 (#274))67d4e950785b19ffa49ff1a8fd5f440ec628340d(two-parent, preservesgit blameattribution)Upstream commits picked up (2)
1536d3975ac3c0d3fcCombined diffstat
Merge conflicts
None.
git merge --no-commit upstream/chrome/m151completed cleanly(
Automatic merge went well; stopped before committing as requested).git diff --checkreports 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); noneof them touch any of the 6 files modified upstream in this sync.
C API shim fixes
None required. No files under
include/c/orsrc/c/were touchedby upstream in this range, so no shim adaptation was needed. Verified
all 79 C API headers/implementations remain intact after the merge:
git blame src/c/sk_canvas.cppstill 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_INCREMENTremains at 0.Created by skia-upstream-sync.