Skip to content

chore: backport running mac app icons from chromium (crrev.com/c/7239386)#50188

Merged
codebytere merged 1 commit intoelectron:40-x-yfrom
KanishkRanjan:40-x-y
Mar 12, 2026
Merged

chore: backport running mac app icons from chromium (crrev.com/c/7239386)#50188
codebytere merged 1 commit intoelectron:40-x-yfrom
KanishkRanjan:40-x-y

Conversation

@KanishkRanjan
Copy link
Copy Markdown
Contributor

@KanishkRanjan KanishkRanjan commented Mar 10, 2026 •
edited by nikwen
Loading

Description of Change

Backports the fix for where running mac app icon not correctly retrieved on macOS Tahoe from chromium

Fixes #48063

Chromium CL: https://chromium-review.googlesource.com/c/chromium/src/+/7239386
Previous PR: #49219

Checklist

Release Notes

Notes: Fixed an issue where running app icons were not correctly retrieved on macOS Tahoe.

@KanishkRanjan KanishkRanjan requested a review from a team as a code owner March 10, 2026 18:28
@nikwen nikwen added backport This is a backport PR 40-x-y semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking and removed backport This is a backport PR labels Mar 10, 2026
nikwen
nikwen approved these changes Mar 10, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@nikwen nikwen left a comment

Choose a reason for hiding this comment

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

Looks good (minus the merge conflict). Thanks! :)

@KanishkRanjan KanishkRanjan force-pushed the 40-x-y branch 2 times, most recently from 37bec07 to 00dccbe Compare March 10, 2026 19:09
@KanishkRanjan
Copy link
Copy Markdown
Contributor Author

KanishkRanjan commented Mar 10, 2026

@nikwen, I took care about merge conflict.

Thanks the review.

@nikwen
Copy link
Copy Markdown
Member

nikwen commented Mar 10, 2026

Looks like the patch needs to be updated with e sync && e patches chromium.

@nikwen nikwen linked an issue Mar 10, 2026 that may be closed by this pull request
desktopCapturer.getSources got error appIcon #48063
Closed
3 tasks
ckerr
ckerr previously requested changes Mar 10, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@ckerr ckerr left a comment

Choose a reason for hiding this comment

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

Needs some whitespace changes to get past CI, which is being finicky:

2026-03-10T19:27:53.5791524Z ======================================================================
2026-03-10T19:27:53.5792046Z There were changes to the patches when applying.
2026-03-10T19:27:53.5792472Z Check the CI artifacts for a patch you can apply to fix it.
2026-03-10T19:27:53.5792852Z ======================================================================
2026-03-10T19:27:53.5793083Z 
2026-03-10T19:27:53.5799119Z From be285bebbf236189fb350716c6fccbf0310c2d70 Mon Sep 17 00:00:00 2001
2026-03-10T19:27:53.5799559Z From: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
2026-03-10T19:27:53.5799930Z Date: Tue, 10 Mar 2026 19:27:53 +0000
2026-03-10T19:27:53.5800168Z Subject: chore: update patches
2026-03-10T19:27:53.5800314Z 
2026-03-10T19:27:53.5800319Z 
2026-03-10T19:27:53.5800621Z diff --git a/patches/chromium/fix_mac_high_res_icons.patch b/patches/chromium/fix_mac_high_res_icons.patch
2026-03-10T19:27:53.5802659Z index 0f9b94d1c4c8785bdfe8999054ad3ecce9bb074e..31f0b3644259afa2220086dea583549eead6e1da 100644
2026-03-10T19:27:53.5803144Z --- a/patches/chromium/fix_mac_high_res_icons.patch
2026-03-10T19:27:53.5803448Z +++ b/patches/chromium/fix_mac_high_res_icons.patch
2026-03-10T19:27:53.5803730Z @@ -1,7 +1,7 @@
2026-03-10T19:27:53.5804023Z -From bc5394765e49981ab69c744240cc5fb68f4b2a99 Mon Sep 17 00:00:00 2001
2026-03-10T19:27:53.5804430Z +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2026-03-10T19:27:53.5804772Z  From: Kanishk Ranjan <kanishkranjan17@gmail.com>
2026-03-10T19:27:53.5805046Z  Date: Thu, 11 Dec 2025 10:03:47 -0800
2026-03-10T19:27:53.5805384Z -Subject: [PATCH] Mac: Fix WebRTC window icon conversion via gfx::Image
2026-03-10T19:27:53.5805863Z +Subject: Mac: Fix WebRTC window icon conversion via gfx::Image
2026-03-10T19:27:53.5806155Z  
2026-03-10T19:27:53.5806441Z  The current WebRTC window picker implementation tries to manually convert
2026-03-10T19:27:53.5806878Z  NSImages to ImageSkia, but it does this incorrectly. As a result, the
2026-03-10T19:27:53.5807265Z @@ -20,13 +20,12 @@ Commit-Queue: Avi Drissman <avi@chromium.org>
2026-03-10T19:27:53.5807590Z  Reviewed-by: Avi Drissman <avi@chromium.org>
2026-03-10T19:27:53.5807945Z  Reviewed-by: Tove Petersson <tovep@chromium.org>
2026-03-10T19:27:53.5808245Z  Cr-Commit-Position: refs/heads/main@{#1557501}
2026-03-10T19:27:53.5808494Z ----
2026-03-10T19:27:53.5808645Z  
2026-03-10T19:27:53.5808813Z  diff --git a/AUTHORS b/AUTHORS
2026-03-10T19:27:53.5809039Z -index fcc545f..d99946b 100644
2026-03-10T19:27:53.5809451Z +index 7eb8f26120a23539b0780eb3f7e1d6a7ac52b102..fb0796cabdec4419e953306608a5b816ea1f2662 100644
2026-03-10T19:27:53.5810139Z  --- a/AUTHORS
2026-03-10T19:27:53.5810304Z  +++ b/AUTHORS
2026-03-10T19:27:53.5810546Z -@@ -826,6 +826,7 @@
2026-03-10T19:27:53.5810865Z +@@ -824,6 +824,7 @@ Kamil Rytarowski <krytarowski@gmail.com>
2026-03-10T19:27:53.5811180Z   Kanaru Sato <i.am.kanaru.sato@gmail.com>
2026-03-10T19:27:53.5811547Z   Kangil Han <kangil.han@samsung.com>
2026-03-10T19:27:53.5811905Z   Kangyuan Shu <kangyuan.shu@intel.com>
2026-03-10T19:27:53.5812172Z @@ -35,7 +34,7 @@ index fcc545f..d99946b 100644
2026-03-10T19:27:53.5812694Z   Karel Král <kralkareliv@gmail.com>
2026-03-10T19:27:53.5812965Z   Karl <karlpolicechromium@gmail.com>
2026-03-10T19:27:53.5813529Z  diff --git a/chrome/browser/media/webrtc/window_icon_util_mac.mm b/chrome/browser/media/webrtc/window_icon_util_mac.mm
2026-03-10T19:27:53.5814046Z -index 8bd216b9..c37b753c 100644
2026-03-10T19:27:53.5814699Z +index 8bd216b9da864c9a8b82231ce6613cc120b32de7..c37b753c6aaf3b5036aacc74b310343fc7379188 100644
2026-03-10T19:27:53.5815307Z  --- a/chrome/browser/media/webrtc/window_icon_util_mac.mm
2026-03-10T19:27:53.5815648Z  +++ b/chrome/browser/media/webrtc/window_icon_util_mac.mm
2026-03-10T19:27:53.5815974Z  @@ -8,9 +8,19 @@
2026-03-10T19:27:53.5816258Z -- 
2026-03-10T19:27:53.5816411Z 2.52.0
2026-03-10T19:27:53.5816505Z 
2026-03-10T19:27:53.5827732Z ##[error]Process completed with exit code 1.

@nikwen
Copy link
Copy Markdown
Member

nikwen commented Mar 10, 2026

@ckerr Should be fixed now. :)

@KanishkRanjan
Copy link
Copy Markdown
Contributor Author

KanishkRanjan commented Mar 11, 2026

Thank you @nikwen and @ckerr for the review 🙂.

@nikwen nikwen requested a review from ckerr March 11, 2026 22:08
@KanishkRanjan
Copy link
Copy Markdown
Contributor Author

KanishkRanjan commented Mar 12, 2026

@nikwen Please trigger re-run.

Thank you for your time.

@codebytere codebytere dismissed ckerr’s stale review March 12, 2026 14:15

Failing CI addressed

@codebytere codebytere merged commit 6b4b7df into electron:40-x-y Mar 12, 2026
235 of 242 checks passed
@release-clerk
Copy link
Copy Markdown

release-clerk bot commented Mar 12, 2026

Release Notes Persisted

Fixed an issue where running app icons were not correctly retrieved on macOS Tahoe.

@KanishkRanjan KanishkRanjan deleted the 40-x-y branch March 12, 2026 15:18
@KanishkRanjan KanishkRanjan mentioned this pull request Mar 13, 2026
Closed
5 tasks
@mlaurencin mlaurencin mentioned this pull request Mar 16, 2026
Merged
6 tasks
@nikwen nikwen mentioned this pull request Mar 17, 2026
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@codebytere codebytere codebytere approved these changes

@nikwen nikwen nikwen approved these changes

@ckerr ckerr Awaiting requested review from ckerr

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

desktopCapturer.getSources got error appIcon

4 participants

@KanishkRanjan @nikwen @ckerr @codebytere