Skip to content

chore: cherry-pick 248acd90d9a3 from skia#50234

Merged
VerteDinde merged 3 commits into41-x-yfrom
cherry-pick/41-x-y-skia-patch/skia/248acd90d9a3
Mar 13, 2026
Merged

chore: cherry-pick 248acd90d9a3 from skia#50234
VerteDinde merged 3 commits into41-x-yfrom
cherry-pick/41-x-y-skia-patch/skia/248acd90d9a3

Conversation

@VerteDinde
Copy link
Copy Markdown
Member

Make sure we are getting the correct atlas for glyph mask format.

Bug: b/491421267
Change-Id: I4eacd46599eca2df8c10a3fc894b9ce890fae1e2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1184076
Commit-Queue: Greg Daniel egdaniel@google.com
Reviewed-by: Michael Ludwig michaelludwig@google.com
(cherry picked from commit 0cab3e4ee34b3bca6ba7df676639d73ffe4b2135)
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1184916

Notes: Backported fix for b/491421267.

@VerteDinde VerteDinde requested a review from a team as a code owner March 12, 2026 23:29
@VerteDinde VerteDinde added semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 41-x-y-skia-patch labels Mar 12, 2026
@VerteDinde VerteDinde changed the base branch from 41-x-y-skia-patch to 41-x-y March 12, 2026 23:39
@VerteDinde VerteDinde enabled auto-merge (squash) March 13, 2026 02:47
@VerteDinde VerteDinde merged commit 61b4c6b into 41-x-y Mar 13, 2026
103 of 104 checks passed
@VerteDinde VerteDinde deleted the cherry-pick/41-x-y-skia-patch/skia/248acd90d9a3 branch March 13, 2026 03:04
@release-clerk
Copy link
Copy Markdown

release-clerk Bot commented Mar 13, 2026

Release Notes Persisted

Backported fix for b/491421267.

Comment thread patches/config.json
{ "patch_dir": "src/electron/patches/ReactiveObjC", "repo": "src/third_party/squirrel.mac/vendor/ReactiveObjC" },
{ "patch_dir": "src/electron/patches/webrtc", "repo": "src/third_party/webrtc" },
{ "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
{ "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia/src" },
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be only src/third_party/skia since the patches already contain the src/ prefix and there is no src/src/?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

41-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants