Skip to content

[skia-sync] Merge upstream chrome/m150 - #344

Merged
mattleibow merged 4 commits into
release/4.150.xfrom
skia-sync/release-4.150.x
Aug 19, 2026
Merged

[skia-sync] Merge upstream chrome/m150#344
mattleibow merged 4 commits into
release/4.150.xfrom
skia-sync/release-4.150.x

Conversation

@mattleibow

@mattleibow mattleibow commented Aug 6, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Note

Required merge method

Merge commit only. Do not squash or rebase this PR. The two-parent merge ancestry is required
so future syncs can prove which upstream commits are already integrated.

Description

Automated upstream merge of chrome/m150.

This pull request was produced by skia-upstream-sync.

SkiaSharp issue

N/A — automated upstream synchronization.

Required SkiaSharp PR

Requires mono/SkiaSharp#4704

Areas affected

  • C API (include/c, src/c)
  • Native dependency / DEPS
  • Build (gn / build files)
  • Upstream Skia merge or rebase
  • Rendering output / behavior
  • Other

Changes

Sync of the mono/skia fork to upstream Skia chrome/m150 bug-fix HEAD.

  • Upstream ref / SHA: chrome/m150 → 9c7b2dffb2433f5a0cc2b77f06025a09126807ed
  • Fork base: b70519562e2d26d3cf56286d3a13ca25152cfae4 (release/4.150.x)
  • Base upstream SHA: a81173f17b197686dc1e6c78515de86e92ddc861
  • Merge commit: 64328ce83ff19e37d61169f2a0b761f2572f7b67 — genuine two-parent
    merge (parents: fork base b70519562e, target upstream 9c7b2dffb2),
    preserving all 1022 fork-patch commits.
  • Mode: release-line bug-fix (M150 → M150). No milestone/version bump — only
    Skia commit hashes advanced.

Upstream range contained 3 commits (linear, same milestone):

  1. [infra] Update task drivers
  2. [M150][ganesh] Check result inside GrResourceProvider::writePixels
  3. [ganesh][gl] ARM FBO query workaround

No C API changes (include/c, src/c untouched). The range only touches
Ganesh GL internals, CI infra, and one autogenerated GPU-workaround header.

Conflict resolution

Only DEPS conflicted. Resolved by accepting the upstream task_drivers CIPD
bump while preserving the fork's deliberate removal of the
checkout_agents_internal var and the agents/shared / agents/internal dep
entries. Verified the merged DEPS equals the fork base plus exactly the single
task_drivers line. task_drivers is a CIPD condition:False dependency (never
checked out) and is absent from cgmanifest.json, so no manifest action was
required.

Fork-patch disposition

audit_fork_patches.py --validate passed against final HEAD. Single changed
fork-delta row (DEPS) has disposition preserved with concrete evidence. No
TODO remains.

Testing

Native library built from source (release-line, externals-download forbidden):
dotnet cake --target=externals-linux --arch=x64 — succeeded (~16 min), produced
libSkiaSharp.so.150.0.0 and libHarfBuzzSharp.so.0.61421.0.

Full unfiltered managed solution against the freshly built native library — all
hosts passed (test-exit-code.txt = 0):

Host Failed Passed Skipped
SkiaSharp.Tests 0 5585 171
SkiaSharp.Tests.SingletonInit 0 1 0
SkiaSharp.Vulkan.Tests 0 2 5
SkiaSharp.Direct3D.Tests 0 2 3

All GpuPolicy-required Linux backends (Mesa softpipe/llvmpipe + lavapipe ICD)
initialized and executed. No required backend was skipped; remaining skips
are the existing platform/host-policy skips (e.g. Direct3D on Linux).

Human review

  • No C API surface changed; the diff is upstream Ganesh/GL bug-fixes plus CI infra.
  • DEPS conflict resolution preserved the fork's intentional agents-dep removal —
    confirm this remains the intended fork stance.
  • Non-Linux platforms (Windows, macOS, Android, iOS, WASM) were not built or tested
    in this sandbox and require the standard CI matrix before merge.

Checklist

  • Targets the release/4.150.x branch
  • Changes above lists every added/changed C API export or states that none changed
  • Companion mono/SkiaSharp PR linked above

Last rendered by the sync workflow: 2026-08-18T13:40:10Z

@erock2112 skcq-be@skia-corp.google.com.iam.gserviceaccount.com
[infra] Update task drivers
b8d8440 
This picks up the change to stop writing ~/.bazelrc.

Bug: b/535581863
Change-Id: Idb58dbbccc52ec2d4f8d4cce128b426a0ddef55a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1316356
Commit-Queue: Kaylee Lubick <kjlubick@google.com>
Auto-Submit: Eric Boren <borenet@google.com>
Reviewed-by: Kaylee Lubick <kjlubick@google.com>
@mattleibow mattleibow mentioned this pull request Aug 6, 2026
Merged
14 tasks
@mattleibow mattleibow added partner/agentic-workflows Issues and PRs created by SkiaSharp agentic workflows. type/milestone-sync Any upstream Skia sync PR (milestone bump, same-milestone bug-fix re-sync, or tip sync). labels Aug 6, 2026
lhkbob and others added 3 commits August 14, 2026 08:36
@lhkbob skcq-be@skia-corp.google.com.iam.gserviceaccount.com
[M150] [ganesh] Check result inside GrResourceProvider::writePixels
680683d 
Original change's description:
> [ganesh] Check result inside GrResourceProvider::writePixels
>
> Bug: 540027341
> Fixed: 540027341
> Change-Id: Icde9d077dfb3ec3cdb7a6e775c6472443dba8781
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1315336
> Auto-Submit: Michael Ludwig <michaelludwig@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>

(cherry picked from commit 5e4f321)

Bug: 546215390,540027341,540027341
Change-Id: Icde9d077dfb3ec3cdb7a6e775c6472443dba8781
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1325856
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>
Thomas Smith skcq-be@skia-corp.google.com.iam.gserviceaccount.com
[ganesh][gl] ARM FBO query workaround
9c7b2df 
* This patch mirrors the workaround implemented in ANGLE which flushes
queries before deleting or unbinding an fbo

Bug: b/534468209
Change-Id: Ifd9cbebfd5f0dd8da5dd4a28b429fe3dbfc7412c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1298756
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Thomas Smith <thomsmit@google.com>
(cherry picked from commit 691742a)
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1327656
Reviewed-by: Robert Phillips <robertphillips@google.com>
@github-actions
Merge remote-tracking branch 'upstream/chrome/m150' into skia-sync/re…
64328ce 
…lease-4.150.x

# Conflicts:
#	DEPS
@mattleibow
mattleibow force-pushed the skia-sync/release-4.150.x branch from 3d2cfdd to 64328ce Compare August 18, 2026 13:40
@mattleibow
mattleibow marked this pull request as ready for review August 19, 2026 23:56
@mattleibow
mattleibow merged commit eb86e4b into release/4.150.x Aug 19, 2026
1 check passed
@mattleibow
mattleibow deleted the skia-sync/release-4.150.x branch August 19, 2026 23:57
mattleibow added a commit to mono/SkiaSharp that referenced this pull request Aug 20, 2026
@mattleibow
[skia-sync] Bump Skia to the Chrome M150 servicing sync (#4704)
47601f5 
[skia-sync] Bump Skia to the Chrome M150 servicing sync (#4704)

Requires: mono/skia#344
Changes: google/skia@a81173f...9c7b2df

Bump externals/skia to the merged release/4.150.x tip produced by the
same-milestone Chrome M150 servicing sync.

Update cgmanifest with the corresponding fork and upstream provenance. Keep
the Skia milestone, soname, assembly, package, and C API versions unchanged.

This bump introduces no managed API, wrapper, or generated binding changes.
The native source build and full unfiltered test suite pass.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

partner/agentic-workflows Issues and PRs created by SkiaSharp agentic workflows. type/milestone-sync Any upstream Skia sync PR (milestone bump, same-milestone bug-fix re-sync, or tip sync).

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mattleibow @erock2112 @lhkbob