[skia-sync] Merge upstream chrome/m151#278
Merged
Merged
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>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mattleibow
marked this pull request as ready for review
July 2, 2026 21:52
mattleibow
added a commit
to mono/SkiaSharp
that referenced
this pull request
Jul 2, 2026
[skia-sync] Merge upstream chrome/m151 bug fixes (#4312) Context: mono/skia#278 Changes: mono/skia@e1be35b...9887799 SkiaSharp-side companion to the mono/skia chrome/m151 sync. Advances the externals/skia submodule from e1be35b25f to the merged skiasharp tip 98877992a585, which pulls upstream chrome/m151 up to 1536d3975057. This is a same-milestone (m151 → m151) bug-fix sync. The two upstream commits it carries are release-notes / CI-config only: * 1536d39750 — Merge 3 release notes into RELEASE_NOTES.md * ac3c0d3fcd — Filter unsupported CQ try jobs on chrome/m151 Nothing under src/, include/, src/c/, include/c/, BUILD.gn, or DEPS changed, so there is no engine behavior change and no C API impact: sk_types.h SK_C_INCREMENT stays at 0 and no binding regeneration is required. The upstream merge landed with zero conflicts. cgmanifest.json is updated to match: * "Main Skia repository reference" commitHash -> 98877992a585 (new skiasharp tip) * Skia CVE-tracking upstream_merge_commit -> 1536d3975057 (chrome/m151 tip) * chrome_milestone stays 151 Created by the skia-upstream-sync automation. Co-authored-by: Matthew Leibowitz <mattleibow@live.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mattleibow
pushed a commit
that referenced
this pull request
Jul 3, 2026
Pulls in the mono/skia PR #278 chrome/m151 bug-fix merge that landed on skiasharp after skia-sync/main was branched, so this branch is a proper descendant of the current skiasharp tip (9887799) instead of a divergent branch from an older tip (e1be35b). Additional commits brought in from skiasharp (all chrome/m151-only — they are on upstream/chrome/m151 but NOT on upstream/main): - 9887799 [skia-sync] Merge upstream chrome/m151 (#278) - 205c36a Merge remote-tracking branch 'upstream/chrome/m151' into skia-sync/m151 - 1536d39 Merge 3 release notes into RELEASE_NOTES.md - ac3c0d3 Filter unsupported CQ try jobs on chrome/m151 Conflicts: none. Auto-merged (git): - infra/bots/jobs.json — dropped cq_config from wasm/CanvasKit jobs (from ac3c0d3 'Filter unsupported CQ try jobs on chrome/m151') - infra/bots/tasks.json — same source commit Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mattleibow
added
the
type/milestone-sync
mattleibow
added
the
partner/agentic-workflows
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.[skia-sync] Merge upstream chrome/m151Same-milestone (m151 → m151) bug-fix sync. Merges the two new commits on
upstream/chrome/m151since our last merge into mono/skia'sskiasharpbranch.Upstream commits merged
1536d39750RELEASE_NOTES.mdac3c0d3fcdchrome/m151Both are release-notes / CI-config only — no changes under
src/,include/,src/c/,include/c/,BUILD.gn, orDEPS.Merge details
79e2e1538e94bb1d6b5bbbc56279036aa7574b10skiasharpate1be35b25f([gn] Drop redundantSK_BUILD_FOR_WASMdefine)chrome/m151at1536d3975057297af8087d22419f6c95dc96305d205c36a8afdb8504a6bdaa602996b44a6b1bcc70git merge --no-commit upstream/chrome/m151— merged cleanlywith zero conflicts.
Files touched
RELEASE_NOTES.mdrelnotes/*.md)infra/bots/jobs.jsoninfra/bots/tasks.jsonrelnotes/ext_format_query.mdrelnotes/rust_png_gainmap.mdrelnotes/strided_getwidths.mdConflicts resolved
None. No fork patch collided with upstream on these files. The
verify-upstream-or-reapply audit (skill Phase 5) is a no-op because no
conflicts required classification.
C API impact
None. No source files under
src/c/orinclude/c/were touched byupstream. All 79 C API
.cpp/.hfiles remain intact.sk_types.hSK_C_INCREMENTunchanged (still0).Source file verification
git diff <merge-base>..upstream/chrome/m151 --diff-filter=AD --name-only -- src/ include/returned no results — no added/deleted upstream source files, so no
BUILD.gnfollow-up is needed.GN args / dependencies
No
DEPSchange, no new upstream gn arg required.Items needing human attention
None.
Created by skia-upstream-sync.