mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1
29328 commits 1 branch 363 tags 3.7 GiB
Commit graph

29328 commits

This branch
This branch
All branches
Author SHA1 Message Date
trop[bot]
33d23f5e00
refactor: remove stray .c_str() calls for absl::StrFormat() (#47576) 
refactor: remove stray .c_str() calls for absl::StrFormat()

StrFormat() understands std::string, std::string_view

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
 2025-06-26 08:18:10 -05:00
trop[bot]
e90282d57a
docs: update asar integrity fuse availability (#47566) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Niklas Wenzel <dev@nikwen.de>
 2025-06-25 17:07:23 -05:00
trop[bot]
13ceef30b7
feat: support customizing window accent color on Windows (#47538) 
* fix: support window accent color in frameless windows

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* refactor: allow customization

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* Update docs/api/structures/base-window-options.md

Co-authored-by: Will Anderson <andersonw@dropbox.com>

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
 2025-06-25 22:51:42 +02:00
trop[bot]
c2a3d240c3
docs: Add C++/Linux tutorial (#47549) 
* docs: Add C++/Linux tutorial

Co-authored-by: Felix Rieseberg <fr@makenotion.com>

* Update docs/tutorial/native-code-and-electron-cpp-linux.md

Co-authored-by: Kilian Valkhof <kilian@kilianvalkhof.com>

Co-authored-by: Felix Rieseberg <fr@makenotion.com>

* Apply suggestions from code review

Co-authored-by: Kilian Valkhof <kilian@kilianvalkhof.com>
Co-authored-by: Erick Zhao <erick@hotmail.ca>

Co-authored-by: Felix Rieseberg <felix@felixrieseberg.com>

* Apply suggestions from code review

Co-authored-by: Erick Zhao <erick@hotmail.ca>

Co-authored-by: Felix Rieseberg <felix@felixrieseberg.com>

* Apply suggestions from code review

Co-authored-by: Erick Zhao <erick@hotmail.ca>

Co-authored-by: Felix Rieseberg <felix@felixrieseberg.com>

* Implement more feedback, lint

Co-authored-by: Felix Rieseberg <felix@felixrieseberg.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Felix Rieseberg <fr@makenotion.com>
Co-authored-by: Felix Rieseberg <felix@felixrieseberg.com>
 2025-06-25 09:34:36 -04:00
trop[bot]
d4a93c896d
fix: ensure /dev/null fd is closed on failure (#47541) 
* fix: ensure /dev/null fd is closed on failure

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* chore: ignore closehandle for windows

Co-authored-by: Robo <hop2deep@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Robo <hop2deep@gmail.com>
 2025-06-24 14:22:56 -04:00
trop[bot]
cd42e9ba05
feat: add support for --no-experimental-global-navigator (#47417) 
chore: add support for --no-experimental-global-navigator

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
 2025-06-24 14:42:46 +02:00
trop[bot]
c15c6d9118
build: rewrite push-patch to use the github API instead of local git commits to ensure commits are signed (#47531) 
* build: rewrite push-patch to use the github API instead of local git commits to ensure commits are signed

Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>

* again

(cherry picked from commit a21afc3e45d15f88c1f754d5990908f248909b41)

Co-authored-by: Samuel Attard <marshallofsound@electronjs.org>

* use pr head ref

(cherry picked from commit 0edcc985fadcce64f01fb77b1c15653d5e66e864)

Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Samuel Attard <marshallofsound@electronjs.org>
 2025-06-24 10:40:15 +02:00
trop[bot]
2d9cb53a86
refactor: simplify titlebar overlay initialization (#47523) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
 2025-06-23 21:56:52 +02:00
trop[bot]
abda6bfda5
build: update cache action to latest (#47517) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
 2025-06-23 14:38:05 +02:00
electron-roller[bot]
20dc3dbc3a
chore: bump chromium to 136.0.7103.177 (36-x-y) (#47500) 
chore: bump chromium in DEPS to 136.0.7103.177

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
 2025-06-19 13:27:38 -04:00
trop[bot]
f9cba35a25
feat: support HIDDevice.collections (#47484) 
* feat: support HIDDevice.collections

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* Update docs/api/structures/hid-device.md

Co-authored-by: Erick Zhao <ezhao@slack-corp.com>

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
 2025-06-18 20:46:59 +02:00
electron-roller[bot]
8d2654c47e
chore: bump chromium to 136.0.7103.168 (36-x-y) (#47441) 
* chore: bump chromium in DEPS to 136.0.7103.168

* chore: update patches

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
 2025-06-16 17:48:02 -04:00
trop[bot]
e98530ab7d
refactor: move gin::Converter<PreloadScript> impl to a .cc file (#47467) 
refactor: move gin::Converter<PreloadScript> impl to a .cc file

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
 2025-06-16 10:55:01 -04:00
trop[bot]
573c8aa656
refactor: have ShowSaveDialogSync() return a std::optional<base::FilePath> (#47452) 
* refactor: have ShowSaveDialogSync() return a std::optional<base::FilePath>

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* fixup! refactor: have ShowSaveDialogSync() return a std::optional<base::FilePath>

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
 2025-06-13 10:03:05 +02:00
trop[bot]
ddee51eb9e
docs: update remaining references to electron-quick-start (#47449) 
* chore: udpate remaining references to electron-quick-start

Co-authored-by: Anny Yang <yangannyx@gmail.com>

* chore: Update docs/tutorial/tutorial-1-prerequisites.md

Co-authored-by: Niklas Wenzel <dev@nikwen.de>

Co-authored-by: Anny Yang <anny@electronjs.org>

* chore: Update docs/tutorial/tutorial-3-preload.md

Co-authored-by: Niklas Wenzel <dev@nikwen.de>

Co-authored-by: Anny Yang <anny@electronjs.org>

* chore: Update docs/tutorial/tutorial-2-first-app.md

Co-authored-by: Niklas Wenzel <dev@nikwen.de>

Co-authored-by: Anny Yang <anny@electronjs.org>

* chore: linebreak

Co-authored-by: Anny Yang <yangannyx@gmail.com>

* chore: swap minimal-repro for npx create-electron-app

Co-authored-by: Anny Yang <yangannyx@gmail.com>

* chore: add back code commands

Co-authored-by: Anny Yang <yangannyx@gmail.com>

* chore: add whitespace

Co-authored-by: Anny Yang <yangannyx@gmail.com>

* chore: remove reference to repo containing old quick start

Co-authored-by: Anny Yang <yangannyx@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Anny Yang <yangannyx@gmail.com>
Co-authored-by: Anny Yang <anny@electronjs.org>
 2025-06-12 12:25:13 +02:00
trop[bot]
351e6e36f4
fix: rework lifetime mgmt of ClearDataTask/ClearDataOperation (#47411) 
* fix: rework lifetime mgmt of ClearDataTask/ClearDataOperation

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* Update shell/browser/api/electron_api_session.cc

Co-authored-by: Robo <hop2deep@gmail.com>

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* Update shell/browser/api/electron_api_session.cc

Co-authored-by: Robo <hop2deep@gmail.com>

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* Update shell/browser/api/electron_api_session.cc

Co-authored-by: Robo <hop2deep@gmail.com>

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* Update shell/browser/api/electron_api_session.cc

Co-authored-by: Robo <hop2deep@gmail.com>

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
 2025-06-12 12:24:50 +02:00
trop[bot]
55557dd3a6
fix: crash calling Fetch.continueResponse with WebContentsView (#47442) 
fix: crash calling Fetch.continueResponse with WebContentsView

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
 2025-06-11 16:28:41 -05:00
trop[bot]
5e9f4eaa3c
docs: remove electron-quick-start from README (#47388) 
Refs https://github.com/electron/.permissions/pull/293

The repo was renamed to `minimal-repro` and is no longer intended to be used as a way to start new projects (see PR above).

Since we really want bugs in `electron/electron` to be reported with a Fiddle gist instead of a standalone repo (makes reproducing and bisecting sooo much easier and safer!), I removed the repo from the README completely instead of mentioning as an issue reproduction starting point.

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Niklas Wenzel <dev@nikwen.de>
 2025-06-11 11:23:44 +02:00
trop[bot]
e3939f2e60
docs: mention kwallet6 command line option (#47438) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Niklas Wenzel <dev@nikwen.de>
 2025-06-10 18:35:49 -05:00
trop[bot]
cac475579e
fix: printing PDF via webContents.print() (#47400) 
fix: printing PDF via webContents.print()

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
 2025-06-10 16:10:44 -04:00
trop[bot]
47caba64ab
docs: no class inheritance (#47432) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Erick Zhao <ezhao@slack-corp.com>
 2025-06-10 13:14:23 +02:00
trop[bot]
15e536b14b
build: cache gitcache dir (#47409) 
* build: cache gitcache dir (#47328)

* revert build: migrate to new chromium git auth

* build: cache gitcache dir

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* chore: update patches

* build: allow updating git cache from workflow dispatch

* temporarily build cache for 36

* revert temp changes

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
 2025-06-10 10:00:00 +02:00
trop[bot]
b328de39e5
feat: [net] add "priority" option to net.request (#47320) 
document the default value of priority option

Update the priority test to not use the httpbin.org as server

Fixed the lint errors

Fixed the build error

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Zeeker <13848632+zeeker999@users.noreply.github.com>
 2025-06-08 13:01:32 +02:00
trop[bot]
ec1704a1dd
docs: mention Azure Trusted Signing (#47383) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Niklas Wenzel <dev@nikwen.de>
 2025-06-05 20:11:34 +02:00
trop[bot]
a997e6e53a
docs: Add Swift/macOS tutorial (#47380) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Felix Rieseberg <fr@makenotion.com>
 2025-06-05 19:12:57 +02:00
trop[bot]
bb09671746
feat: allow intercepting mouse events (#47365) 
* feat: allow intercepting mouse events

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* test: add specs

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* Update spec/api-web-contents-spec.ts

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
 2025-06-05 18:35:33 +02:00
electron-roller[bot]
b66cc92391
chore: bump chromium to 136.0.7103.156 (36-x-y) (#47347) 
chore: bump chromium in DEPS to 136.0.7103.156

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
 2025-06-05 10:10:18 -04:00
trop[bot]
a0633d9e25
feat: expose win.isContentProtected() (#47311) 
* feat: expose win.isContentProtected()

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* chore: remove stray _isContentProtected

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
 2025-06-05 15:47:23 +02:00
trop[bot]
92dd952757
docs: update link to runAsNode fuse (#47375) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Erick Zhao <ezhao@slack-corp.com>
 2025-06-05 15:20:32 +02:00
trop[bot]
8e93599b53
fix: do not load source for electron module in ESM loader synchronous flow (#47343) 
* fix: do not load electron from ESM loader's CJS compatibility

Co-authored-by: clavin <clavin@electronjs.org>

* chore: update patches

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
 2025-06-05 10:04:29 +02:00
Keeley Hammond
62fbb1d67a
chore: cherry-pick 2 changes from 1-M137 (#47368) 
* chore: cherry-pick 45eb42cd398e from v8

* chore: cherry-pick f1e6422a355c from chromium
 2025-06-05 10:00:41 +02:00
electron-roller[bot]
63c7215cd1
chore: bump node to v22.16.0 (36-x-y) (#47214) 
* chore: bump node in DEPS to v22.16.0

* crypto: remove BoringSSL dh-primes addition

https://github.com/nodejs/node/pull/57023

* tools: enable linter in test/fixtures/test\-runner/output

https://github.com/nodejs/node/pull/57698

* src: improve thread safety of TaskQueue

https://github.com/nodejs/node/pull/57910

* buffer: define global v8::CFunction objects as const

https://github.com/nodejs/node/pull/57676

* src: disable abseil deadlock detection

https://github.com/nodejs/node/pull/57582

* zlib: fix pointer alignment

https://github.com/nodejs/node/pull/57727

* chore: fixup patch indices

* src: set default config as node.config.json

https://github.com/nodejs/node/pull/57171

* src: update std::vector<v8::Local<T>> to use v8::LocalVector<T>

https://github.com/nodejs/node/pull/57578

* test: disable chmod tests failing in Docker

https://github.com/nodejs/node/issues/58326

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
 2025-06-04 15:03:35 +02:00
trop[bot]
2336cd67b7
fix: addChildView() crashes when adding a closed WebContentsView (#47340) 
fix: addChildView() crashes when add a closed WebContentsView

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Sida Zhu <zhusida@bytedance.com>
 2025-06-04 14:08:44 +02:00
Keeley Hammond
492589670b
chore: cherry-pick 1 changes from 1-M137 (#47353) 
* chore: [36-x-y] cherry-pick 1 changes from 1-M137

* 7bc0a67ebfbf from v8

* chore: update patches
 2025-06-04 01:28:25 +02:00
trop[bot]
8988a372da
docs: correct 'select-bluetooth-device' requirement (#47334) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
 2025-06-03 10:54:08 +02:00
trop[bot]
2a707ffbd8
fix: Squirrel.Mac crash when zip extraction fails (#47300) 
* fix: Squirrel.Mac crash when zip extraction process fails to launch

Co-authored-by: Niklas Wenzel <dev@nikwen.de>

* chore: add end-to-end test

Co-authored-by: Niklas Wenzel <dev@nikwen.de>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Niklas Wenzel <dev@nikwen.de>
 2025-05-30 10:46:53 -04:00
trop[bot]
1487f5d8b4
docs: add documentation for ImageView (#47298) 
* docs: Add documentation for ImageView

* docs: Add ImageView main process module list in README.md

* test: Add some basic tests for ImageView

* test: Fill out Window embedding tests to better reflect how someone might use an ImageView

* docs: Add notes about using ImageView as a splash screen



* docs: Update ImageView example to show a more complete splash screen example

* docs: Remove view resizing logic since the ImageView automatically gets resized

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Will Anderson <andersonw@dropbox.com>
 2025-05-30 13:48:09 +02:00
trop[bot]
d647bb4bd0
ci: add a problem matcher for ESLint output (#47308) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
 2025-05-30 11:03:04 +02:00
electron-roller[bot]
6e22f50bf8
chore: bump chromium to 136.0.7103.149 (36-x-y) (#47295) 
* chore: bump chromium in DEPS to 136.0.7103.149

* chore: update patches

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
 2025-05-29 17:40:55 -04:00
electron-roller[bot]
14ba395d45
chore: bump chromium to 136.0.7103.116 (36-x-y) (#47288) 
chore: bump chromium in DEPS to 136.0.7103.116

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
 2025-05-28 13:34:45 -04:00
trop[bot]
dd054ea748
build: migrate to new chromium git auth (#47254) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
 2025-05-27 12:50:03 -04:00
trop[bot]
3da28fd115
fix: regression with directory selection in macOS dialogs (#47278) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
 2025-05-27 11:17:09 -04:00
trop[bot]
45542e197b
fix: titlebar showing in content protected window (#47264) 
Closes https://github.com/electron/electron/issues/47152.

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
 2025-05-27 14:24:21 +02:00
trop[bot]
6a884abe6b
chore: update @electron/lint-roller to 3.1.1 (#47256) 
* chore: update @electron/lint-roller to 3.1.1

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* docs: fix broken link in breaking-changes.md

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: fix for Node.js versions without require(esm)

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
 2025-05-27 14:24:06 +02:00
trop[bot]
0c226d8d79
chore: debug crash on DevTools SetOwnerWindow (#47262) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
 2025-05-26 20:33:02 -07:00
trop[bot]
38e990c6e0
refactor: use base::fixed_flat_set in NativeWindowViews::SetAlwaysOnTop() (#47239) 
refactor: use base::fixed_flat_set in NativeWindowViews::SetAlwaysOnTop()

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
 2025-05-23 12:58:24 -05:00
electron-roller[bot]
5bfea79b67
chore: bump chromium to 136.0.7103.115 (36-x-y) (#47215) 
chore: bump chromium in DEPS to 136.0.7103.115

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
 2025-05-23 12:06:09 -04:00
Charles Kerr
1c132a3fdb
fix: fix and enable accessibilitySupportEnabled tests (36-x-y) (#47196) 
fix: fix and enable `accessibilitySupportEnabled` tests (#46825)

* test: enable accessibilitySupportEnabled tests

* test: check both getters after calling each setter

*  fix: do not assume the default initial value of accessibilitySupportEnabled

* chore: remove redundant test case

* chore: disable accessibilitySupportEnabled tests on Linux
 2025-05-23 11:15:57 -04:00
Keeley Hammond
9b624e143e
chore: cherry-pick 69d5a982aed6 from chromium (#47233) 
* chore: cherry-pick 69d5a982aed6 from chromium

* chore: update patches
 2025-05-22 17:48:48 -05:00
trop[bot]
fc2df39c33
ci: add problem matcher for patch conflict output (#47224) 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
 2025-05-22 11:54:54 -07:00