Skip to content

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

Draft
mattleibow wants to merge 2 commits into
release/4.151.xfrom
skia-sync/release-4.151.x
Draft

[skia-sync] Merge upstream chrome/m151#343
mattleibow wants to merge 2 commits into
release/4.151.xfrom
skia-sync/release-4.151.x

Conversation

@mattleibow

@mattleibow mattleibow commented Aug 6, 2026

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/m151.

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

SkiaSharp issue

N/A — automated upstream synchronization.

Required SkiaSharp PR

Requires mono/SkiaSharp#4692

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

Two-parent merge of upstream/chrome/m151 (66cca05ab345fb894cc80ed412e2fa79f687f5d9,
"[infra] Update task drivers") into the fork base bdd0c3a8ea on release/4.151.x.

  • Upstream range: 86bb2f25f46f4d620b4a26e738f59a9b6c22d2eb..66cca05ab3 (1 commit).
  • Merge commit: a1adf52824 (parents: fork base bdd0c3a8ea + target 66cca05ab3).
  • Conflicts: only DEPS. Resolved accept-target for task_drivers_revision
    (b5d31abb…5e4f3217…) and the new checkout_agents_internal: False var. All fork DEPS
    customizations (commented-out third_party/externals/*, chromium-fork URLs) preserved
    byte-identical to the fork base.
  • Fork patches: 198 unchanged, 1 changed (DEPS, disposition = preserved). HarfBuzz kept on
    the fork revision.
  • Dependencies: skia-dependency-changes.json reports no tracked dependency changes. No
    cgmanifest.json version change; task_drivers_revision is untracked CI infra.
  • C API / source: none changed (src/, include/, src/c/, include/c/, BUILD.gn all
    untouched). This is a CI-infrastructure-only upstream bug-fix commit.

Testing

Native libSkiaSharp.so.151.0.0 and libHarfBuzzSharp built from source (Linux x64, ~10m38s).
Bindings regenerated: no binding changes, no new native functions.

Full unfiltered tests/SkiaSharp.Tests.Console.sln (net10.0|x64), exit 0:

Host Passed Skipped Failed
SkiaSharp.Tests 5721 181 0
SingletonInit 1 0 0
Vulkan 2 10 0
Direct3D 2 3 0

No required GpuPolicy backend was skipped; Vulkan/Direct3D skips are platform/host-policy owned.

Human review

  • Only Linux x64 was built and tested here. Windows, macOS (arm64/x64), Android, iOS, and WASM were
    not executed locally and need CI coverage.
  • Direct3D is a Windows-only backend not exercisable on this host.

Checklist

  • Targets the release/4.151.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-06T01:38:23Z

erock2112 and others added 2 commits August 5, 2026 14:00
This picks up the change to stop writing ~/.bazelrc.

Bug: b/535581863
Change-Id: I005851a78a9909e04f6f187170828c5bd857cf7f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1316357
Commit-Queue: Kaylee Lubick <kjlubick@google.com>
Reviewed-by: Kaylee Lubick <kjlubick@google.com>
Auto-Submit: Eric Boren <borenet@google.com>
@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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

2 participants